diff options
-rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/mach-mxs/timer.c | 2 | ||||
-rw-r--r-- | drivers/clk/mxs/clk-imx23.c | 2 | ||||
-rw-r--r-- | drivers/clk/mxs/clk-imx28.c | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 56afcf41aae0..27ce8070e187 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi | |||
@@ -426,6 +426,7 @@ | |||
426 | compatible = "fsl,imx23-timrot", "fsl,timrot"; | 426 | compatible = "fsl,imx23-timrot", "fsl,timrot"; |
427 | reg = <0x80068000 0x2000>; | 427 | reg = <0x80068000 0x2000>; |
428 | interrupts = <28 29 30 31>; | 428 | interrupts = <28 29 30 31>; |
429 | clocks = <&clks 28>; | ||
429 | }; | 430 | }; |
430 | 431 | ||
431 | auart0: serial@8006c000 { | 432 | auart0: serial@8006c000 { |
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 7ba49662b9bc..c2f10d381f03 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi | |||
@@ -838,6 +838,7 @@ | |||
838 | compatible = "fsl,imx28-timrot", "fsl,timrot"; | 838 | compatible = "fsl,imx28-timrot", "fsl,timrot"; |
839 | reg = <0x80068000 0x2000>; | 839 | reg = <0x80068000 0x2000>; |
840 | interrupts = <48 49 50 51>; | 840 | interrupts = <48 49 50 51>; |
841 | clocks = <&clks 26>; | ||
841 | }; | 842 | }; |
842 | 843 | ||
843 | auart0: serial@8006a000 { | 844 | auart0: serial@8006a000 { |
diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index fe2903d7939a..f5142aa234a3 100644 --- a/arch/arm/mach-mxs/timer.c +++ b/arch/arm/mach-mxs/timer.c | |||
@@ -247,7 +247,7 @@ static void __init mxs_timer_init(struct device_node *np) | |||
247 | struct clk *timer_clk; | 247 | struct clk *timer_clk; |
248 | int irq; | 248 | int irq; |
249 | 249 | ||
250 | timer_clk = clk_get_sys("timrot", NULL); | 250 | timer_clk = of_clk_get(np, 0); |
251 | if (IS_ERR(timer_clk)) { | 251 | if (IS_ERR(timer_clk)) { |
252 | pr_err("%s: failed to get clk\n", __func__); | 252 | pr_err("%s: failed to get clk\n", __func__); |
253 | return; | 253 | return; |
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c index 291cc44713f4..46ae6bebe445 100644 --- a/drivers/clk/mxs/clk-imx23.c +++ b/drivers/clk/mxs/clk-imx23.c | |||
@@ -159,8 +159,6 @@ int __init mx23_clocks_init(void) | |||
159 | of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); | 159 | of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); |
160 | } | 160 | } |
161 | 161 | ||
162 | clk_register_clkdev(clks[clk32k], NULL, "timrot"); | ||
163 | |||
164 | for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) | 162 | for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) |
165 | clk_prepare_enable(clks[clks_init_on[i]]); | 163 | clk_prepare_enable(clks[clks_init_on[i]]); |
166 | 164 | ||
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index d861bfd8c537..fb30cd92b234 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c | |||
@@ -237,7 +237,6 @@ int __init mx28_clocks_init(void) | |||
237 | of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); | 237 | of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); |
238 | } | 238 | } |
239 | 239 | ||
240 | clk_register_clkdev(clks[xbus], NULL, "timrot"); | ||
241 | clk_register_clkdev(clks[enet_out], NULL, "enet_out"); | 240 | clk_register_clkdev(clks[enet_out], NULL, "enet_out"); |
242 | 241 | ||
243 | for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) | 242 | for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) |