| Message ID | 1432530849-12312-1-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Mon, May 25, 2015 at 01:14:09PM +0800, Shawn Guo wrote: > 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> Hi Daniel, What's your option on this? I plan to send this to arm-soc folks via i.MX tree for 4.2, but need your ACK on this one. Shawn > --- > Changes since v2: > - Rename the file to timer-imx-gpt.c > > arch/arm/mach-imx/Makefile | 2 +- > drivers/clocksource/Makefile | 1 + > arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx-gpt.c | 0 > 3 files changed, 2 insertions(+), 1 deletion(-) > rename arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx-gpt.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..579e4bcf8763 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-gpt.o > diff --git a/arch/arm/mach-imx/time.c b/drivers/clocksource/timer-imx-gpt.c > similarity index 100% > rename from arch/arm/mach-imx/time.c > rename to drivers/clocksource/timer-imx-gpt.c > -- > 1.9.1 >
On 05/25/2015 07:14 AM, Shawn Guo wrote: > 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> I don't see the Kconfig change.
On Wed, May 27, 2015 at 02:50:27PM +0200, Daniel Lezcano wrote: > On 05/25/2015 07:14 AM, Shawn Guo wrote: > >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> > > I don't see the Kconfig change. As timer-imx-gpt is the only supported timer for i.MX, we use architecture option CONFIG_ARCH_MXC to control it for now. Shawn
On 05/27/2015 04:04 PM, Shawn Guo wrote: > On Wed, May 27, 2015 at 02:50:27PM +0200, Daniel Lezcano wrote: >> On 05/25/2015 07:14 AM, Shawn Guo wrote: >>> 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> >> >> I don't see the Kconfig change. > > As timer-imx-gpt is the only supported timer for i.MX, we use > architecture option CONFIG_ARCH_MXC to control it for now. Hi Shawn, please use the same as: https://lkml.org/lkml/2015/5/22/855 and then add in the platform's Kconfig the timer option as: https://lkml.org/lkml/2015/5/22/937 Thanks -- Daniel
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..579e4bcf8763 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-gpt.o diff --git a/arch/arm/mach-imx/time.c b/drivers/clocksource/timer-imx-gpt.c similarity index 100% rename from arch/arm/mach-imx/time.c rename to drivers/clocksource/timer-imx-gpt.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> --- Changes since v2: - Rename the file to timer-imx-gpt.c arch/arm/mach-imx/Makefile | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx-gpt.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/arm/mach-imx/time.c => drivers/clocksource/timer-imx-gpt.c (100%)