From 56ca741e3c97ac12529c7ff55c69535af6a83577 Mon Sep 17 00:00:00 2001
From: Richard Zhao <richard.zhao@freescale.com>
Date: Fri, 27 Apr 2012 15:02:59 +0800
Subject: [PATCH] --- yaml --- r: 308343 b: refs/heads/master c:
 071dea508f72e879041bd68b56aad41befb2dd45 h: refs/heads/master i:   308341:
 0645b84f250e835c3bbc83ad4f6b7a62d5fbb954   308339:
 f47e758b6aab73bb8489ca77a81f58a582915586   308335:
 64d4f15dadf73c7aef91deea1d8dc870f8f4f036 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-imx/mach-imx6q.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6f50f52eae0d..06487a774fe1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f07439c43252c3c2e669a5ee3762f4559179828d
+refs/heads/master: 071dea508f72e879041bd68b56aad41befb2dd45
diff --git a/trunk/arch/arm/mach-imx/mach-imx6q.c b/trunk/arch/arm/mach-imx/mach-imx6q.c
index 512c18da6b9c..706e45c2a839 100644
--- a/trunk/arch/arm/mach-imx/mach-imx6q.c
+++ b/trunk/arch/arm/mach-imx/mach-imx6q.c
@@ -75,11 +75,16 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev)
 	return 0;
 }
 
+static void __init imx6q_sabrelite_init(void)
+{
+	phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
+				ksz9021rn_phy_fixup);
+}
+
 static void __init imx6q_init_machine(void)
 {
 	if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
-		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
-					   ksz9021rn_phy_fixup);
+		imx6q_sabrelite_init();
 
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);