ARM: i.MX6: call ksz9021 phy fixup for all i.MX6 boards

In current U-Boot the sabrelite, nitrogen6x and titanium all need
the same fixup for the ksz9021 phy. Instead of limiting the fixup
to a single board apply them for all.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 7be13f8e69a01f22b43d28b4b22a42a23f006c8d..7f238465765f9ede4ff9e687e3614a0d322490ae 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -139,12 +139,12 @@ put_clk:
                clk_put(cko1);
 }
 
-static void __init imx6q_sabrelite_init(void)
+static void __init imx6q_enet_phy_init(void)
 {
-       if (IS_BUILTIN(CONFIG_PHYLIB))
+       if (IS_BUILTIN(CONFIG_PHYLIB)) {
                phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
                                ksz9021rn_phy_fixup);
-       imx6q_sabrelite_cko1_setup();
+       }
 }
 
 static void __init imx6q_sabresd_cko1_setup(void)
@@ -205,11 +205,13 @@ static void __init imx6q_usb_init(void)
 static void __init imx6q_init_machine(void)
 {
        if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
-               imx6q_sabrelite_init();
+               imx6q_sabrelite_cko1_setup();
        else if (of_machine_is_compatible("fsl,imx6q-sabresd") ||
                        of_machine_is_compatible("fsl,imx6dl-sabresd"))
                imx6q_sabresd_init();
 
+       imx6q_enet_phy_init();
+
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
        imx_anatop_init();