summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-06-20 17:34:31 +0200
committerShawn Guo <shawn.guo@linaro.org>2013-08-16 13:11:19 +0800
commit14078291d89b9a1294618b649c856f4de9ef642f (patch)
tree5cca8025e827558c18a4f6361941f5e08c2b6a44 /arch/arm/mach-imx
parent5ae90d8e467e625e447000cb4335c4db973b1095 (diff)
downloadlinux-stable-14078291d89b9a1294618b649c856f4de9ef642f.tar.gz
linux-stable-14078291d89b9a1294618b649c856f4de9ef642f.tar.bz2
linux-stable-14078291d89b9a1294618b649c856f4de9ef642f.zip
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>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/mach-imx6q.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 7be13f8e69a0..7f238465765f 100644
--- 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();