diff mbox

[v1,2/4] ARM: imx6ul: add fec MAC refrence clock and phy fixup init

Message ID 1437122304-20598-3-git-send-email-b38611@freescale.com
State New
Headers show

Commit Message

Nimrod Andy July 17, 2015, 8:38 a.m. UTC 
Add FEC MAC refrence clock init.
Add phy fixup init for i.MX6ul 14x14 evk board that installs KSZ8081 phy.
For the phy, there needs extra phy fixup for MII and RMII mode.

Signed-off-by: Fugang Duan <b38611@freescale.com>
---
 arch/arm/mach-imx/mach-imx6ul.c | 43 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

Comments

Shawn Guo July 28, 2015, 5:17 a.m. UTC | #1 
On Fri, Jul 17, 2015 at 04:38:22PM +0800, Fugang Duan wrote:
> Add FEC MAC refrence clock init.
> Add phy fixup init for i.MX6ul 14x14 evk board that installs KSZ8081 phy.
> For the phy, there needs extra phy fixup for MII and RMII mode.
> 
> Signed-off-by: Fugang Duan <b38611@freescale.com>
> ---
>  arch/arm/mach-imx/mach-imx6ul.c | 43 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c
> index f206506..d4f8b6c 100644
> --- a/arch/arm/mach-imx/mach-imx6ul.c
> +++ b/arch/arm/mach-imx/mach-imx6ul.c
> @@ -9,9 +9,51 @@
>  #include <linux/of_platform.h>
>  #include <asm/mach/arch.h>
>  #include <asm/mach/map.h>
> +#include <linux/phy.h>
> +#include <linux/regmap.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

Please group <linux/*> headers together and have them sort
alphabetically.

>  
>  #include "common.h"
>  
> +static void __init imx6ul_enet_clk_init(void)
> +{
> +	struct regmap *gpr;
> +
> +	gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
> +	if (!IS_ERR(gpr))
> +		regmap_update_bits(gpr, IOMUXC_GPR1, IMX6UL_GPR1_ENET_CLK_DIR,
> +				   IMX6UL_GPR1_ENET_CLK_OUTPUT);

Is it correct to set this up for all board designs?

> +	else
> +		pr_err("failed to find fsl,imx6ul-iomux-gpr regmap\n");
> +
> +}
> +
> +static int ksz8081_phy_fixup(struct phy_device *dev)
> +{
> +	if (dev && dev->interface == PHY_INTERFACE_MODE_MII) {
> +		phy_write(dev, 0x1f, 0x8110);
> +		phy_write(dev, 0x16, 0x201);
> +	} else if (dev && dev->interface == PHY_INTERFACE_MODE_RMII) {
> +		phy_write(dev, 0x1f, 0x8190);
> +		phy_write(dev, 0x16, 0x202);
> +	}

Can this be done from device tree like what 954c396756e3 (net/phy:
micrel: Add OF configuration support for ksz9021) does?
> +
> +	return 0;
> +}
> +
> +#define PHY_ID_KSZ8081	0x00221560

include/linux/micrel_phy.h already has this.

Shawn

> +static void __init imx6ul_enet_phy_init(void)
> +{
> +	phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff, ksz8081_phy_fixup);
> +}
> +
> +static inline void imx6ul_enet_init(void)
> +{
> +	imx6ul_enet_clk_init();
> +	imx6ul_enet_phy_init();
> +}
> +
>  static void __init imx6ul_init_machine(void)
>  {
>  	struct device *parent;
> @@ -21,6 +63,7 @@ static void __init imx6ul_init_machine(void)
>  		pr_warn("failed to initialize soc device\n");
>  
>  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
> +	imx6ul_enet_init();
>  	imx_anatop_init();
>  }
>  
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Fugang Duan July 28, 2015, 7:12 a.m. UTC | #2 
From: Shawn Guo <shawnguo@kernel.org> Sent: Tuesday, July 28, 2015 1:17 PM
> To: Duan Fugang-B38611
> Cc: b20596@solarflare.com; linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v1 2/4] ARM: imx6ul: add fec MAC refrence clock and
> phy fixup init
> 
> On Fri, Jul 17, 2015 at 04:38:22PM +0800, Fugang Duan wrote:
> > Add FEC MAC refrence clock init.
> > Add phy fixup init for i.MX6ul 14x14 evk board that installs KSZ8081
> phy.
> > For the phy, there needs extra phy fixup for MII and RMII mode.
> >
> > Signed-off-by: Fugang Duan <b38611@freescale.com>
> > ---
> >  arch/arm/mach-imx/mach-imx6ul.c | 43
> > +++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 43 insertions(+)
> >
> > diff --git a/arch/arm/mach-imx/mach-imx6ul.c
> > b/arch/arm/mach-imx/mach-imx6ul.c index f206506..d4f8b6c 100644
> > --- a/arch/arm/mach-imx/mach-imx6ul.c
> > +++ b/arch/arm/mach-imx/mach-imx6ul.c
> > @@ -9,9 +9,51 @@
> >  #include <linux/of_platform.h>
> >  #include <asm/mach/arch.h>
> >  #include <asm/mach/map.h>
> > +#include <linux/phy.h>
> > +#include <linux/regmap.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
> 
> Please group <linux/*> headers together and have them sort alphabetically.
> 
Thanks, I will change it in next version.

> >
> >  #include "common.h"
> >
> > +static void __init imx6ul_enet_clk_init(void) {
> > +	struct regmap *gpr;
> > +
> > +	gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
> > +	if (!IS_ERR(gpr))
> > +		regmap_update_bits(gpr, IOMUXC_GPR1, IMX6UL_GPR1_ENET_CLK_DIR,
> > +				   IMX6UL_GPR1_ENET_CLK_OUTPUT);
> 
> Is it correct to set this up for all board designs?

Yes, i.MX6ul enet only support RMII/MII mode. The setting is for all board design.
> 
> > +	else
> > +		pr_err("failed to find fsl,imx6ul-iomux-gpr regmap\n");
> > +
> > +}
> > +
> > +static int ksz8081_phy_fixup(struct phy_device *dev) {
> > +	if (dev && dev->interface == PHY_INTERFACE_MODE_MII) {
> > +		phy_write(dev, 0x1f, 0x8110);
> > +		phy_write(dev, 0x16, 0x201);
> > +	} else if (dev && dev->interface == PHY_INTERFACE_MODE_RMII) {
> > +		phy_write(dev, 0x1f, 0x8190);
> > +		phy_write(dev, 0x16, 0x202);
> > +	}
> 
> Can this be done from device tree like what 954c396756e3 (net/phy:
> micrel: Add OF configuration support for ksz9021) does?
The patch (net/phy: micrel: Add OF configuration support for ksz9021) is just to tune phy ksz9021 timing.

Above setting is to override strap-in for MII/RMII mode and override strap-in for B-CAST_OFF, and select clock input for pin9 from 25Mhz and 50Mhz. 
It is phy fixup setting.

> > +
> > +	return 0;
> > +}
> > +
> > +#define PHY_ID_KSZ8081	0x00221560
> 
> include/linux/micrel_phy.h already has this.
> 
> Shawn
> 
> > +static void __init imx6ul_enet_phy_init(void) {
> > +	phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff,
> > +ksz8081_phy_fixup); }
> > +
> > +static inline void imx6ul_enet_init(void) {
> > +	imx6ul_enet_clk_init();
> > +	imx6ul_enet_phy_init();
> > +}
> > +
> >  static void __init imx6ul_init_machine(void)  {
> >  	struct device *parent;
> > @@ -21,6 +63,7 @@ static void __init imx6ul_init_machine(void)
> >  		pr_warn("failed to initialize soc device\n");
> >
> >  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
> > +	imx6ul_enet_init();
> >  	imx_anatop_init();
> >  }
> >
> > --
> > 1.9.1
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
diff mbox

Patch

diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c
index f206506..d4f8b6c 100644
--- a/arch/arm/mach-imx/mach-imx6ul.c
+++ b/arch/arm/mach-imx/mach-imx6ul.c
@@ -9,9 +9,51 @@ 
 #include <linux/of_platform.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include <linux/phy.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
 
 #include "common.h"
 
+static void __init imx6ul_enet_clk_init(void)
+{
+	struct regmap *gpr;
+
+	gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
+	if (!IS_ERR(gpr))
+		regmap_update_bits(gpr, IOMUXC_GPR1, IMX6UL_GPR1_ENET_CLK_DIR,
+				   IMX6UL_GPR1_ENET_CLK_OUTPUT);
+	else
+		pr_err("failed to find fsl,imx6ul-iomux-gpr regmap\n");
+
+}
+
+static int ksz8081_phy_fixup(struct phy_device *dev)
+{
+	if (dev && dev->interface == PHY_INTERFACE_MODE_MII) {
+		phy_write(dev, 0x1f, 0x8110);
+		phy_write(dev, 0x16, 0x201);
+	} else if (dev && dev->interface == PHY_INTERFACE_MODE_RMII) {
+		phy_write(dev, 0x1f, 0x8190);
+		phy_write(dev, 0x16, 0x202);
+	}
+
+	return 0;
+}
+
+#define PHY_ID_KSZ8081	0x00221560
+static void __init imx6ul_enet_phy_init(void)
+{
+	phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff, ksz8081_phy_fixup);
+}
+
+static inline void imx6ul_enet_init(void)
+{
+	imx6ul_enet_clk_init();
+	imx6ul_enet_phy_init();
+}
+
 static void __init imx6ul_init_machine(void)
 {
 	struct device *parent;
@@ -21,6 +63,7 @@  static void __init imx6ul_init_machine(void)
 		pr_warn("failed to initialize soc device\n");
 
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+	imx6ul_enet_init();
 	imx_anatop_init();
 }