diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-10-21 09:10:56 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-10-21 09:10:56 +0800 |
| commit | 6886530bab1e059a0fc5bab9813c739413d033bf (patch) | |
| tree | c5ae8b0853b09909986c3f8fca6e30fab24653b3 /arch/arm/mach-imx/mach-imx6q.c | |
| parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) | |
| parent | 64cc69abbb32e17aa44d2c696eca65cb6f9364ca (diff) | |
| download | talos-obmc-linux-6886530bab1e059a0fc5bab9813c739413d033bf.tar.gz talos-obmc-linux-6886530bab1e059a0fc5bab9813c739413d033bf.zip | |
Merge remote-tracking branch 'shesselba/clk-of-init-v2_for-3.13' into imx/soc
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 90372a21087f..3be0fa0e9796 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -11,9 +11,7 @@ */ #include <linux/clk.h> -#include <linux/clk-provider.h> #include <linux/clkdev.h> -#include <linux/clocksource.h> #include <linux/cpu.h> #include <linux/delay.h> #include <linux/export.h> @@ -192,6 +190,9 @@ static void __init imx6q_1588_init(void) static void __init imx6q_init_machine(void) { + imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", + imx6q_revision()); + imx6q_enet_phy_init(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); @@ -293,14 +294,6 @@ static void __init imx6q_init_irq(void) irqchip_init(); } -static void __init imx6q_timer_init(void) -{ - of_clk_init(NULL); - clocksource_of_init(); - imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", - imx6q_revision()); -} - static const char *imx6q_dt_compat[] __initdata = { "fsl,imx6dl", "fsl,imx6q", @@ -311,7 +304,6 @@ DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad/DualLite (Device Tree)") .smp = smp_ops(imx_smp_ops), .map_io = imx6q_map_io, .init_irq = imx6q_init_irq, - .init_time = imx6q_timer_init, .init_machine = imx6q_init_machine, .init_late = imx6q_init_late, .dt_compat = imx6q_dt_compat, |
