diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-04 07:42:55 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:46 -0400 |
commit | 41136b664ad11d542e8378c757dac9ab174b0805 (patch) | |
tree | 403b96b534c0fff82cd22c398a435def8bc1a628 /arch/arm/mach-tegra | |
parent | b39e0249830a1b88cc213d1e9d3d1ca1f40df3b8 (diff) |
ARM: tegra: remove custom .init_time hook
With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r-- | arch/arm/mach-tegra/tegra.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index 4da271df2e6c..2e2192807830 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c | |||
@@ -16,7 +16,6 @@ | |||
16 | * | 16 | * |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/clocksource.h> | ||
20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
22 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
@@ -33,7 +32,6 @@ | |||
33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
34 | #include <linux/sys_soc.h> | 33 | #include <linux/sys_soc.h> |
35 | #include <linux/usb/tegra_usb_phy.h> | 34 | #include <linux/usb/tegra_usb_phy.h> |
36 | #include <linux/clk-provider.h> | ||
37 | #include <linux/clk/tegra.h> | 35 | #include <linux/clk/tegra.h> |
38 | 36 | ||
39 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
@@ -84,12 +82,6 @@ out: | |||
84 | of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); | 82 | of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); |
85 | } | 83 | } |
86 | 84 | ||
87 | static void __init tegra_dt_init_time(void) | ||
88 | { | ||
89 | of_clk_init(NULL); | ||
90 | clocksource_of_init(); | ||
91 | } | ||
92 | |||
93 | static void __init paz00_init(void) | 85 | static void __init paz00_init(void) |
94 | { | 86 | { |
95 | if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC)) | 87 | if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC)) |
@@ -129,7 +121,6 @@ DT_MACHINE_START(TEGRA_DT, "NVIDIA Tegra SoC (Flattened Device Tree)") | |||
129 | .smp = smp_ops(tegra_smp_ops), | 121 | .smp = smp_ops(tegra_smp_ops), |
130 | .init_early = tegra_init_early, | 122 | .init_early = tegra_init_early, |
131 | .init_irq = tegra_dt_init_irq, | 123 | .init_irq = tegra_dt_init_irq, |
132 | .init_time = tegra_dt_init_time, | ||
133 | .init_machine = tegra_dt_init, | 124 | .init_machine = tegra_dt_init, |
134 | .init_late = tegra_dt_init_late, | 125 | .init_late = tegra_dt_init_late, |
135 | .restart = tegra_assert_system_reset, | 126 | .restart = tegra_assert_system_reset, |