aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-08-12 10:43:22 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-09-11 04:26:54 -0400
commit721a44145aa789b9d2ee7927afa28c2d60ffa036 (patch)
tree0107e8eda388ada91fca197dbc41de8448fc5cc8
parent1a60a4de8be4f8cf17f5d36c2642153b9a95184a (diff)
ARM: imx53: decouple device tree boot from board files
Now, imx53 device tree kernel calls pinctrl to set up pins. The functions used to hook up non-DT pin setup is not needed for DT boot any more. Remove them from DT image. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/mach-imx/imx53-dt.c20
-rw-r--r--arch/arm/plat-mxc/include/mach/common.h4
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-imx/imx53-dt.c b/arch/arm/mach-imx/imx53-dt.c
index 21fcbd0e3081..29711e95579f 100644
--- a/arch/arm/mach-imx/imx53-dt.c
+++ b/arch/arm/mach-imx/imx53-dt.c
@@ -50,14 +50,6 @@ static const struct of_dev_auxdata imx53_auxdata_lookup[] __initconst = {
50 { /* sentinel */ } 50 { /* sentinel */ }
51}; 51};
52 52
53static const struct of_device_id imx53_iomuxc_of_match[] __initconst = {
54 { .compatible = "fsl,imx53-iomuxc-ard", .data = imx53_ard_common_init, },
55 { .compatible = "fsl,imx53-iomuxc-evk", .data = imx53_evk_common_init, },
56 { .compatible = "fsl,imx53-iomuxc-qsb", .data = imx53_qsb_common_init, },
57 { .compatible = "fsl,imx53-iomuxc-smd", .data = imx53_smd_common_init, },
58 { /* sentinel */ }
59};
60
61static void __init imx53_qsb_init(void) 53static void __init imx53_qsb_init(void)
62{ 54{
63 struct clk *clk; 55 struct clk *clk;
@@ -73,18 +65,6 @@ static void __init imx53_qsb_init(void)
73 65
74static void __init imx53_dt_init(void) 66static void __init imx53_dt_init(void)
75{ 67{
76 struct device_node *node;
77 const struct of_device_id *of_id;
78 void (*func)(void);
79
80 node = of_find_matching_node(NULL, imx53_iomuxc_of_match);
81 if (node) {
82 of_id = of_match_node(imx53_iomuxc_of_match, node);
83 func = of_id->data;
84 func();
85 of_node_put(node);
86 }
87
88 if (of_machine_is_compatible("fsl,imx53-qsb")) 68 if (of_machine_is_compatible("fsl,imx53-qsb"))
89 imx53_qsb_init(); 69 imx53_qsb_init();
90 70
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index 7128e9710417..96fa702dc783 100644
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@ -138,10 +138,6 @@ extern void imx_gpc_init(void);
138extern void imx_gpc_pre_suspend(void); 138extern void imx_gpc_pre_suspend(void);
139extern void imx_gpc_post_resume(void); 139extern void imx_gpc_post_resume(void);
140extern void imx51_babbage_common_init(void); 140extern void imx51_babbage_common_init(void);
141extern void imx53_ard_common_init(void);
142extern void imx53_evk_common_init(void);
143extern void imx53_qsb_common_init(void);
144extern void imx53_smd_common_init(void);
145extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); 141extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
146extern void imx6q_clock_map_io(void); 142extern void imx6q_clock_map_io(void);
147 143