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

Commit 9affbd24 authored Jan 21, 2014 by Linus Walleij Committed by Daniel Lezcano Mar 11, 2014

ARM: u300: move timer driver to clocksource



Move the U300 timer driver down to the clocksource driver
subsystem and keep arch/arm clean.

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

parent 7b52ad2e

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1319,6 +1319,7 @@ M: Linus Walleij <linus.walleij@linaro.org>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Supported
		F: arch/arm/mach-u300/
		F: drivers/clocksource/timer-u300.c
		F: drivers/i2c/busses/i2c-stu300.c
		F: drivers/rtc/rtc-coh901331.c
		F: drivers/watchdog/coh901327_wdt.c

arch/arm/mach-u300/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		# Makefile for the linux kernel, U300 machine.
		#

		obj-y := core.o timer.o
		obj-y := core.o
		obj-m :=
		obj-n :=
		obj- :=

drivers/clocksource/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ obj-$(CONFIG_ARCH_MARCO) += timer-marco.o
		obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o
		obj-$(CONFIG_ARCH_MXS) += mxs_timer.o
		obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o
		obj-$(CONFIG_ARCH_U300) += timer-u300.o
		obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o
		obj-$(CONFIG_SUN5I_HSTIMER) += timer-sun5i.o
		obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o

arch/arm/mach-u300/timer.c→drivers/clocksource/timer-u300.c

+0 −4

Original line number	Diff line number	Diff line
		/*
		*
		* arch/arm/mach-u300/timer.c
		*
		*
		* Copyright (C) 2007-2009 ST-Ericsson AB
		* License terms: GNU General Public License (GPL) version 2
		* Timer COH 901 328, runs the OS timer interrupt.