| Message ID | 1432308599-28643-13-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Shawn Guo > -----Original Message----- > From: Shawn Guo [mailto:shawn.guo@linaro.org] > Sent: 2015年5月22日 10:30 > To: linux-arm-kernel@lists.infradead.org > Cc: kernel@pengutronix.de; Daniel Lezcano; Wang Shenwei-B38339; Arnd > Bergmann; Shawn Guo > Subject: [PATCH v2 12/12] ARM: imx: move timer driver into drivers/clocksource > > After the cleanup on imx timer driver, now it's ready to be moved into > drivers/clocksource/. Let's do it. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- > arch/arm/mach-imx/Makefile | 2 +- > drivers/clocksource/Makefile | 1 + > arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx.c | 0 > 3 files changed, 2 insertions(+), 1 deletion(-) rename > arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx.c (100%) > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index > 799e65a530be..f70e18470799 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -1,4 +1,4 @@ > -obj-y := time.o cpu.o system.o irq-common.o > +obj-y := cpu.o system.o irq-common.o > > obj-$(CONFIG_SOC_IMX1) += mm-imx1.o > obj-$(CONFIG_SOC_IMX21) += mm-imx21.o > diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index > 5b85f6adb258..5c5a89479631 100644 > --- a/drivers/clocksource/Makefile > +++ b/drivers/clocksource/Makefile > @@ -52,3 +52,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += > timer-integrator-ap.o > obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o > obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o > obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o > +obj-$(CONFIG_ARCH_MXC) += timer-imx.o Because there are several types of timers on imx family socs, and this is the driver for the GPT block only, so it would be better to change the file name to timer-gpt.c Regards, Shenwei > diff --git a/arch/arm/mach-imx/time.c b/drivers/clocksource/timer-imx.c > similarity index 100% rename from arch/arm/mach-imx/time.c rename to > drivers/clocksource/timer-imx.c > -- > 1.9.1
On Fri, May 22, 2015 at 06:28:59PM +0000, Shenwei Wang wrote: > > @@ -52,3 +52,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += > > timer-integrator-ap.o > > obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o > > obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o > > obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o > > +obj-$(CONFIG_ARCH_MXC) += timer-imx.o > > Because there are several types of timers on imx family socs, and this is the driver for the GPT block only, so it would be better to change the file name to timer-gpt.c > Okay, I decided to name it timer-imx-gpt.c, so that when people try to find the timer driver for i.MX in drivers/clocksource folder, it will be easier. Shawn
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 799e65a530be..f70e18470799 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,4 +1,4 @@ -obj-y := time.o cpu.o system.o irq-common.o +obj-y := cpu.o system.o irq-common.o obj-$(CONFIG_SOC_IMX1) += mm-imx1.o obj-$(CONFIG_SOC_IMX21) += mm-imx21.o diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 5b85f6adb258..5c5a89479631 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -52,3 +52,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o +obj-$(CONFIG_ARCH_MXC) += timer-imx.o diff --git a/arch/arm/mach-imx/time.c b/drivers/clocksource/timer-imx.c similarity index 100% rename from arch/arm/mach-imx/time.c rename to drivers/clocksource/timer-imx.c
After the cleanup on imx timer driver, now it's ready to be moved into drivers/clocksource/. Let's do it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- arch/arm/mach-imx/Makefile | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx.c (100%)