aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-04-22 00:48:42 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-06-17 04:04:15 -0400
commit59d5c0ce8a790475b22a18a94386bc2b3dd1aa31 (patch)
tree508d43cf289db47c11286831c70e7fd02b9d69b9
parent950504973d0122e61364fa381e8424bde1183ff4 (diff)
ARM: imx: move imx53-qsb audio codec clk lookup into DT
With device tree clk lookup support in place, we can move audio codec clk lookup for ssi_ext1 into device tree now, so that imx53_qsb_init() can be saved. Since ssi_ext2 lookup is used nowhere, it gets removed together with ssi_ext1 lookup from clk driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx53-qsb.dts1
-rw-r--r--arch/arm/mach-imx/clk-imx51-imx53.c2
-rw-r--r--arch/arm/mach-imx/mach-imx53.c16
3 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index 160d1bcab2be..a885d374d448 100644
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -147,6 +147,7 @@
147 reg = <0x0a>; 147 reg = <0x0a>;
148 VDDA-supply = <&reg_3p2v>; 148 VDDA-supply = <&reg_3p2v>;
149 VDDIO-supply = <&reg_3p2v>; 149 VDDIO-supply = <&reg_3p2v>;
150 clocks = <&clks 150>;
150 }; 151 };
151}; 152};
152 153
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 04b1bad68350..9afac26fa1cc 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -327,8 +327,6 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
327 clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0"); 327 clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");
328 clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1"); 328 clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");
329 clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "imx-ssi.2"); 329 clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "imx-ssi.2");
330 clk_register_clkdev(clk[ssi_ext1_gate], "ssi_ext1", NULL);
331 clk_register_clkdev(clk[ssi_ext2_gate], "ssi_ext2", NULL);
332 clk_register_clkdev(clk[sdma_gate], NULL, "imx35-sdma"); 330 clk_register_clkdev(clk[sdma_gate], NULL, "imx35-sdma");
333 clk_register_clkdev(clk[cpu_podf], NULL, "cpufreq-cpu0.0"); 331 clk_register_clkdev(clk[cpu_podf], NULL, "cpufreq-cpu0.0");
334 clk_register_clkdev(clk[iim_gate], "iim", NULL); 332 clk_register_clkdev(clk[iim_gate], "iim", NULL);
diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c
index 74e7b94c22e7..98c58944015a 100644
--- a/arch/arm/mach-imx/mach-imx53.c
+++ b/arch/arm/mach-imx/mach-imx53.c
@@ -24,26 +24,10 @@
24#include "hardware.h" 24#include "hardware.h"
25#include "mx53.h" 25#include "mx53.h"
26 26
27static void __init imx53_qsb_init(void)
28{
29 struct clk *clk;
30
31 clk = clk_get_sys(NULL, "ssi_ext1");
32 if (IS_ERR(clk)) {
33 pr_err("failed to get clk ssi_ext1\n");
34 return;
35 }
36
37 clk_register_clkdev(clk, NULL, "0-000a");
38}
39
40static void __init imx53_dt_init(void) 27static void __init imx53_dt_init(void)
41{ 28{
42 mxc_arch_reset_init_dt(); 29 mxc_arch_reset_init_dt();
43 30
44 if (of_machine_is_compatible("fsl,imx53-qsb"))
45 imx53_qsb_init();
46
47 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 31 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
48} 32}
49 33