diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-28 10:11:42 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-28 10:11:42 -0700 |
| commit | 0fc869e8f22bc74a9971f9025f8608d6587c4fb7 (patch) | |
| tree | 7c0d565e13309f1c3e9931265e8f44b50b53d8a7 /arch/arm/mach-tegra/tegra.c | |
| parent | 4dcf03346af269579fdfdadb662d22035c9fceb6 (diff) | |
| parent | 64cc69abbb32e17aa44d2c696eca65cb6f9364ca (diff) | |
Merge branch 'cleanup/dt-clock' into next/soc
Merging in dt clock cleanup as a pre-req with some of the later SoC branches.
There are a handful of conflicts here -- some of the already merged SoC
branches should have been based on the cleanup but weren't.
In particular, a remove/add of include on highbank and two remove/remove
conflicts on kirkwood were fixed up.
* cleanup/dt-clock: (28 commits)
ARM: vt8500: remove custom .init_time hook
ARM: vexpress: remove custom .init_time hook
ARM: tegra: remove custom .init_time hook
ARM: sunxi: remove custom .init_time hook
ARM: sti: remove custom .init_time hook
ARM: socfpga: remove custom .init_time hook
ARM: rockchip: remove custom .init_time hook
ARM: prima2: remove custom .init_time hook
ARM: nspire: remove custom .init_time hook
ARM: nomadik: remove custom .init_time hook
ARM: mxs: remove custom .init_time hook
ARM: kirkwood: remove custom .init_time hook
ARM: imx: remove custom .init_time hook
ARM: highbank: remove custom .init_time hook
ARM: exynos: remove custom .init_time hook
ARM: dove: remove custom .init_time hook
ARM: bcm2835: remove custom .init_time hook
ARM: bcm: provide common arch init for DT clocks
ARM: call of_clk_init from default time_init handler
ARM: vt8500: prepare for arch-wide .init_time callback
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/tegra.c')
| -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 80b801a94677..ce553d557c31 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -16,7 +16,6 @@ * */ -#include <linux/clocksource.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> @@ -33,7 +32,6 @@ #include <linux/slab.h> #include <linux/sys_soc.h> #include <linux/usb/tegra_usb_phy.h> -#include <linux/clk-provider.h> #include <linux/clk/tegra.h> #include <linux/irqchip.h> @@ -145,12 +143,6 @@ out: of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); } -static void __init tegra_dt_init_time(void) -{ - of_clk_init(NULL); - clocksource_of_init(); -} - static void __init paz00_init(void) { if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC)) @@ -193,7 +185,6 @@ DT_MACHINE_START(TEGRA_DT, "NVIDIA Tegra SoC (Flattened Device Tree)") .smp = smp_ops(tegra_smp_ops), .init_early = tegra_init_early, .init_irq = tegra_dt_init_irq, - .init_time = tegra_dt_init_time, .init_machine = tegra_dt_init, .init_late = tegra_dt_init_late, .restart = tegra_pmc_restart, |