evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: mxs: remove custom .init_time hook

Browse source 
This patch converts clk-imx2[38] clocksource_of_init compatible init
associated with fsl,imx2[38]-clkctrl. With arch/arm calling
of_clk_init(NULL) from time_init(), we can now also remove custom
.init_time hooks.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
Sebastian Hesselbarth 2013-09-04 13:16:01 +02:00
parent a169e3aa37
commit dd03ee9ae5
4 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/arm/mach-mxs/mach-mxs.c
View file

@ -13,8 +13,6 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/mxs.h> #include <linux/clk/mxs.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/clocksource.h>
#include <linux/clk-provider.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio.h>
@ -490,16 +488,6 @@ static void mxs_restart(enum reboot_mode mode, const char *cmd)
soft_restart(0); soft_restart(0);
} }
static void __init mxs_timer_init(void)
{
if (of_machine_is_compatible("fsl,imx23"))
mx23_clocks_init();
else
mx28_clocks_init();
of_clk_init(NULL);
clocksource_of_init();
}
static const char *mxs_dt_compat[] __initdata = { static const char *mxs_dt_compat[] __initdata = {
"fsl,imx28", "fsl,imx28",
"fsl,imx23", "fsl,imx23",
@ -508,7 +496,6 @@ static const char *mxs_dt_compat[] __initdata = {
DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
.handle_irq = icoll_handle_irq, .handle_irq = icoll_handle_irq,
.init_time = mxs_timer_init,
.init_machine = mxs_machine_init, .init_machine = mxs_machine_init,
.init_late = mxs_pm_init, .init_late = mxs_pm_init,
.dt_compat = mxs_dt_compat, .dt_compat = mxs_dt_compat,

15
drivers/clk/mxs/clk-imx23.c
View file

@ -12,6 +12,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/mxs.h> #include <linux/clk/mxs.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/clk-provider.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
@ -100,16 +101,16 @@ static enum imx23_clk clks_init_on[] __initdata = {
cpu, hbus, xbus, emi, uart, cpu, hbus, xbus, emi, uart,
}; };
int __init mx23_clocks_init(void) static void __init mx23_clocks_init(struct device_node *np)
{ {
struct device_node *np; struct device_node *dcnp;
u32 i; u32 i;
np = of_find_compatible_node(NULL, NULL, "fsl,imx23-digctl"); dcnp = of_find_compatible_node(NULL, NULL, "fsl,imx23-digctl");
digctrl = of_iomap(np, 0); digctrl = of_iomap(dcnp, 0);
WARN_ON(!digctrl); WARN_ON(!digctrl);
of_node_put(dcnp);
np = of_find_compatible_node(NULL, NULL, "fsl,imx23-clkctrl");
clkctrl = of_iomap(np, 0); clkctrl = of_iomap(np, 0);
WARN_ON(!clkctrl); WARN_ON(!clkctrl);
@ -162,7 +163,7 @@ int __init mx23_clocks_init(void)
if (IS_ERR(clks[i])) { if (IS_ERR(clks[i])) {
pr_err("i.MX23 clk %d: register failed with %ld\n", pr_err("i.MX23 clk %d: register failed with %ld\n",
i, PTR_ERR(clks[i])); i, PTR_ERR(clks[i]));
return PTR_ERR(clks[i]); return;
} }
clk_data.clks = clks; clk_data.clks = clks;
@ -172,5 +173,5 @@ int __init mx23_clocks_init(void)
for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
clk_prepare_enable(clks[clks_init_on[i]]); clk_prepare_enable(clks[clks_init_on[i]]);
return 0;
} }
CLK_OF_DECLARE(imx23_clkctrl, "fsl,imx23-clkctrl", mx23_clocks_init);

16
drivers/clk/mxs/clk-imx28.c
View file

@ -12,6 +12,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk/mxs.h> #include <linux/clk/mxs.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/clk-provider.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
@ -154,16 +155,16 @@ static enum imx28_clk clks_init_on[] __initdata = {
cpu, hbus, xbus, emi, uart, cpu, hbus, xbus, emi, uart,
}; };
int __init mx28_clocks_init(void) static void __init mx28_clocks_init(struct device_node *np)
{ {
struct device_node *np; struct device_node *dcnp;
u32 i; u32 i;
np = of_find_compatible_node(NULL, NULL, "fsl,imx28-digctl"); dcnp = of_find_compatible_node(NULL, NULL, "fsl,imx28-digctl");
digctrl = of_iomap(np, 0); digctrl = of_iomap(dcnp, 0);
WARN_ON(!digctrl); WARN_ON(!digctrl);
of_node_put(dcnp);
np = of_find_compatible_node(NULL, NULL, "fsl,imx28-clkctrl");
clkctrl = of_iomap(np, 0); clkctrl = of_iomap(np, 0);
WARN_ON(!clkctrl); WARN_ON(!clkctrl);
@ -239,7 +240,7 @@ int __init mx28_clocks_init(void)
if (IS_ERR(clks[i])) { if (IS_ERR(clks[i])) {
pr_err("i.MX28 clk %d: register failed with %ld\n", pr_err("i.MX28 clk %d: register failed with %ld\n",
i, PTR_ERR(clks[i])); i, PTR_ERR(clks[i]));
return PTR_ERR(clks[i]); return;
} }
clk_data.clks = clks; clk_data.clks = clks;
@ -250,6 +251,5 @@ int __init mx28_clocks_init(void)
for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
clk_prepare_enable(clks[clks_init_on[i]]); clk_prepare_enable(clks[clks_init_on[i]]);
return 0;
} }
CLK_OF_DECLARE(imx28_clkctrl, "fsl,imx28-clkctrl", mx28_clocks_init);

2
include/linux/clk/mxs.h
View file

@ -9,8 +9,6 @@
#ifndef __LINUX_CLK_MXS_H #ifndef __LINUX_CLK_MXS_H
#define __LINUX_CLK_MXS_H #define __LINUX_CLK_MXS_H
int mx23_clocks_init(void);
int mx28_clocks_init(void);
int mxs_saif_clkmux_select(unsigned int clkmux); int mxs_saif_clkmux_select(unsigned int clkmux);
#endif #endif