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>

diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index 160d1bcab2be0d30b5d21eb8af11030afd72afce..a885d374d448288dd5f1d981c7dd6a255744260b 100644 (file)
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -147,6 +147,7 @@
                reg = <0x0a>;
                VDDA-supply = <&reg_3p2v>;
                VDDIO-supply = <&reg_3p2v>;
+               clocks = <&clks 150>;
        };
 };
 

diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 04b1bad68350f3df315a758bca09c7dbd0c4c823..9afac26fa1ccb13874271061c3754e3b952574d5 100644 (file)
--- 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,
        clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");
        clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");
        clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "imx-ssi.2");
-       clk_register_clkdev(clk[ssi_ext1_gate], "ssi_ext1", NULL);
-       clk_register_clkdev(clk[ssi_ext2_gate], "ssi_ext2", NULL);
        clk_register_clkdev(clk[sdma_gate], NULL, "imx35-sdma");
        clk_register_clkdev(clk[cpu_podf], NULL, "cpufreq-cpu0.0");
        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 74e7b94c22e7237755ce2995f4539c4de123d7ac..98c58944015a596db1431e770f5a5c9765300227 100644 (file)
--- a/arch/arm/mach-imx/mach-imx53.c
+++ b/arch/arm/mach-imx/mach-imx53.c
@@ -24,26 +24,10 @@
 #include "hardware.h"
 #include "mx53.h"
 
-static void __init imx53_qsb_init(void)
-{
-       struct clk *clk;
-
-       clk = clk_get_sys(NULL, "ssi_ext1");
-       if (IS_ERR(clk)) {
-               pr_err("failed to get clk ssi_ext1\n");
-               return;
-       }
-
-       clk_register_clkdev(clk, NULL, "0-000a");
-}
-
 static void __init imx53_dt_init(void)
 {
        mxc_arch_reset_init_dt();
 
-       if (of_machine_is_compatible("fsl,imx53-qsb"))
-               imx53_qsb_init();
-
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }