From mboxrd@z Thu Jan  1 00:00:00 1970
From: shawnguo@kernel.org (Shawn Guo)
Date: Sun, 6 Sep 2015 20:37:50 +0800
Subject: [PATCH v2 2/5] ARM: imx: add enet init for i.MX7D platform
In-Reply-To: <1440386992-6775-3-git-send-email-b38611@freescale.com>
References: <1440386992-6775-1-git-send-email-b38611@freescale.com>
 <1440386992-6775-3-git-send-email-b38611@freescale.com>
Message-ID: <20150906123750.GW30746@tiger>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Mon, Aug 24, 2015 at 11:29:49AM +0800, Fugang Duan wrote:
> Add enet phy fixup, clock source init for i.MX7D platform.
> 
> Signed-off-by: Fugang Duan <B38611@freescale.com>
> ---
>  arch/arm/mach-imx/mach-imx7d.c | 76 ++++++++++++++++++++++++++++++++++++++++--
>  1 file changed, 74 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c
> index 4d4a190..07e9a7e 100644
> --- a/arch/arm/mach-imx/mach-imx7d.c
> +++ b/arch/arm/mach-imx/mach-imx7d.c
> @@ -5,13 +5,84 @@
>   * it under the terms of the GNU General Public License version 2 as
>   * published by the Free Software Foundation.
>   */
> -#include <linux/irqchip.h>
> -#include <linux/of_platform.h>
>  #include <asm/mach/arch.h>
>  #include <asm/mach/map.h>
> +#include <linux/irqchip.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/mfd/syscon/imx7-iomuxc-gpr.h>
> +#include <linux/of_platform.h>
> +#include <linux/phy.h>
> +#include <linux/regmap.h>
>  
>  #include "common.h"

Please arrange the headers like below:

#include <linux/irqchip.h>
#include <linux/mfd/syscon.h>
#include <linux/mfd/syscon/imx7-iomuxc-gpr.h>
#include <linux/of_platform.h>
#include <linux/phy.h>
#include <linux/regmap.h>

#include <asm/mach/arch.h>
#include <asm/mach/map.h>

#include "common.h"

>  
> +static int ar8031_phy_fixup(struct phy_device *dev)
> +{
> +	u16 val;
> +
> +	/* Set RGMII IO voltage to 1.8V */
> +	phy_write(dev, 0x1d, 0x1f);
> +	phy_write(dev, 0x1e, 0x8);
> +
> +	/* disable phy AR8031 SmartEEE function. */
> +	phy_write(dev, 0xd, 0x3);
> +	phy_write(dev, 0xe, 0x805d);
> +	phy_write(dev, 0xd, 0x4003);
> +	val = phy_read(dev, 0xe);
> +	val &= ~(0x1 << 8);
> +	phy_write(dev, 0xe, val);
> +
> +	/* introduce tx clock delay */
> +	phy_write(dev, 0x1d, 0x5);
> +	val = phy_read(dev, 0x1e);
> +	val |= 0x0100;
> +	phy_write(dev, 0x1e, val);
> +
> +	return 0;
> +}
> +
> +static int bcm54220_phy_fixup(struct phy_device *dev)
> +{
> +	/* enable RXC skew select RGMII copper mode */
> +	phy_write(dev, 0x1e, 0x21);
> +	phy_write(dev, 0x1f, 0x7ea8);
> +	phy_write(dev, 0x1e, 0x2f);
> +	phy_write(dev, 0x1f, 0x71b7);
> +
> +	return 0;
> +}
> +
> +#define PHY_ID_AR8031	0x004dd074
> +#define PHY_ID_BCM54220	0x600d8589

Have a blank line here.

Shawn

> +static void __init imx7d_enet_phy_init(void)
> +{
> +	if (IS_BUILTIN(CONFIG_PHYLIB)) {
> +		phy_register_fixup_for_uid(PHY_ID_AR8031, 0xffffffff,
> +					   ar8031_phy_fixup);
> +		phy_register_fixup_for_uid(PHY_ID_BCM54220, 0xffffffff,
> +					   bcm54220_phy_fixup);
> +	}
> +}
> +
> +static void __init imx7d_enet_clk_sel(void)
> +{
> +	struct regmap *gpr;
> +
> +	gpr = syscon_regmap_lookup_by_compatible("fsl,imx7d-iomuxc-gpr");
> +	if (!IS_ERR(gpr)) {
> +		regmap_update_bits(gpr, IOMUXC_GPR1, IMX7D_GPR1_ENET_TX_CLK_SEL_MASK, 0);
> +		regmap_update_bits(gpr, IOMUXC_GPR1, IMX7D_GPR1_ENET_CLK_DIR_MASK, 0);
> +	} else {
> +		pr_err("failed to find fsl,imx7d-iomux-gpr regmap\n");
> +	}
> +}
> +
> +static inline void imx7d_enet_init(void)
> +{
> +	imx7d_enet_phy_init();
> +	imx7d_enet_clk_sel();
> +}
> +
>  static void __init imx7d_init_machine(void)
>  {
>  	struct device *parent;
> @@ -22,6 +93,7 @@ static void __init imx7d_init_machine(void)
>  
>  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
>  	imx_anatop_init();
> +	imx7d_enet_init();
>  }
>  
>  static void __init imx7d_init_irq(void)
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel