From 60a29f07a85cac26b440352dd352b969cabd9a7c Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 13 Aug 2012 21:13:10 +0800
Subject: [PATCH] --- yaml --- r: 326783 b: refs/heads/master c:
 07827831822517b3713661c943e42389977407ff h: refs/heads/master i:   326781:
 ebf904f925764aa1189de2cac19e956aa53b58dd   326779:
 ee15ecd70537e6c169ec04898394b5a58fd4d022   326775:
 7a77660eb4a90de6ccb6e1adaea58dc95086a5d2   326767:
 16603978b3656a1f7e5f4f20cc5e705d4ae54300   326751:
 678dae0858b04317d13df3ff892400ae364e1e23   326719:
 df4113243d84c07cdc4bb1ccfd065a96b1c1d8a7   326655:
 4e221374f2bff633168a9e3b57d55f9afbf445df v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-imx/imx51-dt.c            | 17 -----------------
 trunk/arch/arm/plat-mxc/include/mach/common.h |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 4da8e91ddefe..bfff02db9803 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6798f88bc1458eb7ab671b874880fd7ba77cfb4
+refs/heads/master: 07827831822517b3713661c943e42389977407ff
diff --git a/trunk/arch/arm/mach-imx/imx51-dt.c b/trunk/arch/arm/mach-imx/imx51-dt.c
index 306cddca6c7c..f233b4bb2342 100644
--- a/trunk/arch/arm/mach-imx/imx51-dt.c
+++ b/trunk/arch/arm/mach-imx/imx51-dt.c
@@ -43,25 +43,8 @@ static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = {
 	{ /* sentinel */ }
 };
 
-static const struct of_device_id imx51_iomuxc_of_match[] __initconst = {
-	{ .compatible = "fsl,imx51-iomuxc-babbage", .data = imx51_babbage_common_init, },
-	{ /* sentinel */ }
-};
-
 static void __init imx51_dt_init(void)
 {
-	struct device_node *node;
-	const struct of_device_id *of_id;
-	void (*func)(void);
-
-	node = of_find_matching_node(NULL, imx51_iomuxc_of_match);
-	if (node) {
-		of_id = of_match_node(imx51_iomuxc_of_match, node);
-		func = of_id->data;
-		func();
-		of_node_put(node);
-	}
-
 	of_platform_populate(NULL, of_default_bus_match_table,
 			     imx51_auxdata_lookup, NULL);
 }
diff --git a/trunk/arch/arm/plat-mxc/include/mach/common.h b/trunk/arch/arm/plat-mxc/include/mach/common.h
index 0932fc6e2223..28ba09f4ebb9 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/common.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/common.h
@@ -136,7 +136,6 @@ extern void imx_src_prepare_restart(void);
 extern void imx_gpc_init(void);
 extern void imx_gpc_pre_suspend(void);
 extern void imx_gpc_post_resume(void);
-extern void imx51_babbage_common_init(void);
 extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
 extern void imx6q_clock_map_io(void);