Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1711b1e1 authored Oct 23, 2012 by Stephen Warren

ARM: tegra: move timer.c to drivers/clocksource/



Move arch/arm/mach-tegra/timer.c to drivers/clocksource/tegra20_timer.c
so that the code is co-located with other clocksource drivers, and to
reduce the size of the mach-tegra directory.

Signed-off-by: Stephen Warren <swarren@nvidia.com>

parent f3dab398

arch/arm/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -642,6 +642,7 @@ config ARCH_TEGRA
	select ARCH_HAS_CPUFREQ		select ARCH_HAS_CPUFREQ
	select CLKDEV_LOOKUP		select CLKDEV_LOOKUP
	select CLKSRC_MMIO		select CLKSRC_MMIO
			select CLKSRC_OF
	select COMMON_CLK		select COMMON_CLK
	select GENERIC_CLOCKEVENTS		select GENERIC_CLOCKEVENTS
	select GENERIC_GPIO		select GENERIC_GPIO

arch/arm/mach-tegra/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,6 @@ obj-y += common.o
	obj-y += io.o		obj-y += io.o
	obj-y += irq.o		obj-y += irq.o
	obj-y += clock.o		obj-y += clock.o
	obj-y += timer.o
	obj-y += fuse.o		obj-y += fuse.o
	obj-y += pmc.o		obj-y += pmc.o
	obj-y += flowctrl.o		obj-y += flowctrl.o

arch/arm/mach-tegra/board-dt-tegra20.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@
	*		*
	*/		*/

			#include <linux/clocksource.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	@@ -203,7 +204,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")
	.init_early = tegra20_init_early,		.init_early = tegra20_init_early,
	.init_irq = tegra_dt_init_irq,		.init_irq = tegra_dt_init_irq,
	.handle_irq = gic_handle_irq,		.handle_irq = gic_handle_irq,
	.init_time = tegra_init_timer,		.init_time = clocksource_of_init,
	.init_machine = tegra_dt_init,		.init_machine = tegra_dt_init,
	.init_late = tegra_dt_init_late,		.init_late = tegra_dt_init_late,
	.restart = tegra_assert_system_reset,		.restart = tegra_assert_system_reset,

arch/arm/mach-tegra/board-dt-tegra30.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@
	*		*
	*/		*/

			#include <linux/clocksource.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/of.h>		#include <linux/of.h>
	#include <linux/of_address.h>		#include <linux/of_address.h>
	@@ -113,7 +114,7 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)")
	.init_early = tegra30_init_early,		.init_early = tegra30_init_early,
	.init_irq = tegra_dt_init_irq,		.init_irq = tegra_dt_init_irq,
	.handle_irq = gic_handle_irq,		.handle_irq = gic_handle_irq,
	.init_time = tegra_init_timer,		.init_time = clocksource_of_init,
	.init_machine = tegra30_dt_init,		.init_machine = tegra30_dt_init,
	.init_late = tegra_init_late,		.init_late = tegra_init_late,
	.restart = tegra_assert_system_reset,		.restart = tegra_assert_system_reset,

arch/arm/mach-tegra/board.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,5 +55,4 @@ static inline int harmony_pcie_init(void) { return 0; }

	void __init tegra_paz00_wifikill_init(void);		void __init tegra_paz00_wifikill_init(void);

	extern void tegra_init_timer(void);
	#endif		#endif