* [GIT PULL] timer: vt8500: Move timer code to drivers/clocksource
@ 2013-01-14 5:09 Tony Prisk
2013-01-14 5:09 ` [PATCH] " Tony Prisk
2013-01-14 22:16 ` [GIT PULL] " Olof Johansson
0 siblings, 2 replies; 12+ messages in thread
From: Tony Prisk @ 2013-01-14 5:09 UTC (permalink / raw)
To: Olof Johansson
Cc: linux-kernel, linux-arm-kernel, vt8500-wm8505-linux-kernel, arm,
Tony Prisk
Hi Olof,
Not sure if I have done this correctly but this is the patch to move the
vt8500/timer.c code into drivers/clocksource.
I based it on timer/cleanup from armsoc (hopefully this is right - if not, a
few pointers in the right direction would be appreciated).
Regards
Tony P
The following changes since commit 1c2584c3a1c882fec729147a46d822522552e38c:
ARM: sunxi: fix struct sys_timer removal (2013-01-08 10:50:43 -0800)
are available in the git repository at:
git://server.prisktech.co.nz/git/linuxwmt.git tags/vt8500/timer
for you to fetch changes up to ff7ec345f0ece9ddbb28538b70ba0c7f0acc17dc:
timer: vt8500: Move timer code to drivers/clocksource (2013-01-14 17:58:21 +1300)
----------------------------------------------------------------
Move arch-vt8500/timer.c to drivers/clocksource/vt8500-timer.c
----------------------------------------------------------------
Tony Prisk (1):
timer: vt8500: Move timer code to drivers/clocksource
arch/arm/mach-vt8500/Kconfig | 1 +
arch/arm/mach-vt8500/Makefile | 2 +-
arch/arm/mach-vt8500/common.h | 1 -
arch/arm/mach-vt8500/vt8500.c | 1 +
drivers/clocksource/Kconfig | 3 +++
drivers/clocksource/Makefile | 1 +
.../timer.c => drivers/clocksource/vt8500_timer.c | 0
include/linux/vt8500_timer.h | 22 ++++++++++++++++++++
8 files changed, 29 insertions(+), 2 deletions(-)
rename arch/arm/mach-vt8500/timer.c => drivers/clocksource/vt8500_timer.c (100%)
create mode 100644 include/linux/vt8500_timer.h
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 5:09 [GIT PULL] timer: vt8500: Move timer code to drivers/clocksource Tony Prisk @ 2013-01-14 5:09 ` Tony Prisk 2013-01-14 5:13 ` [Bulk] " Tony Prisk 2013-01-14 16:34 ` Stephen Warren 2013-01-14 22:16 ` [GIT PULL] " Olof Johansson 1 sibling, 2 replies; 12+ messages in thread From: Tony Prisk @ 2013-01-14 5:09 UTC (permalink / raw) To: Olof Johansson Cc: linux-kernel, linux-arm-kernel, vt8500-wm8505-linux-kernel, arm, Tony Prisk This patch moves arch-vt8500/timer.c into drivers/clocksource and updates the necessary Kconfig/Makefile options. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> --- arch/arm/mach-vt8500/Kconfig | 1 + arch/arm/mach-vt8500/Makefile | 2 +- arch/arm/mach-vt8500/common.h | 1 - arch/arm/mach-vt8500/timer.c | 184 ------------------------------------ arch/arm/mach-vt8500/vt8500.c | 1 + drivers/clocksource/Kconfig | 3 + drivers/clocksource/Makefile | 1 + drivers/clocksource/vt8500_timer.c | 184 ++++++++++++++++++++++++++++++++++++ include/linux/vt8500_timer.h | 22 +++++ 9 files changed, 213 insertions(+), 186 deletions(-) delete mode 100644 arch/arm/mach-vt8500/timer.c create mode 100644 drivers/clocksource/vt8500_timer.c create mode 100644 include/linux/vt8500_timer.h diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig index 2ed0b7d..570a801 100644 --- a/arch/arm/mach-vt8500/Kconfig +++ b/arch/arm/mach-vt8500/Kconfig @@ -8,5 +8,6 @@ config ARCH_VT8500 select GENERIC_CLOCKEVENTS select GENERIC_GPIO select HAVE_CLK + select VT8500_TIMER help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. diff --git a/arch/arm/mach-vt8500/Makefile b/arch/arm/mach-vt8500/Makefile index e035251..92ceb24 100644 --- a/arch/arm/mach-vt8500/Makefile +++ b/arch/arm/mach-vt8500/Makefile @@ -1 +1 @@ -obj-$(CONFIG_ARCH_VT8500) += irq.o timer.o vt8500.o +obj-$(CONFIG_ARCH_VT8500) += irq.o vt8500.o diff --git a/arch/arm/mach-vt8500/common.h b/arch/arm/mach-vt8500/common.h index 6f2b843..77611a6 100644 --- a/arch/arm/mach-vt8500/common.h +++ b/arch/arm/mach-vt8500/common.h @@ -18,7 +18,6 @@ #include <linux/of.h> -void __init vt8500_timer_init(void); int __init vt8500_irq_init(struct device_node *node, struct device_node *parent); diff --git a/arch/arm/mach-vt8500/timer.c b/arch/arm/mach-vt8500/timer.c deleted file mode 100644 index 3dd21a4..0000000 --- a/arch/arm/mach-vt8500/timer.c +++ /dev/null @@ -1,184 +0,0 @@ -/* - * arch/arm/mach-vt8500/timer.c - * - * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> - * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * This file is copied and modified from the original timer.c provided by - * Alexey Charkov. Minor changes have been made for Device Tree Support. - */ - -#include <linux/io.h> -#include <linux/irq.h> -#include <linux/interrupt.h> -#include <linux/clocksource.h> -#include <linux/clockchips.h> -#include <linux/delay.h> -#include <asm/mach/time.h> - -#include <linux/of.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> - -#define VT8500_TIMER_OFFSET 0x0100 -#define VT8500_TIMER_HZ 3000000 -#define TIMER_MATCH_VAL 0x0000 -#define TIMER_COUNT_VAL 0x0010 -#define TIMER_STATUS_VAL 0x0014 -#define TIMER_IER_VAL 0x001c /* interrupt enable */ -#define TIMER_CTRL_VAL 0x0020 -#define TIMER_AS_VAL 0x0024 /* access status */ -#define TIMER_COUNT_R_ACTIVE (1 << 5) /* not ready for read */ -#define TIMER_COUNT_W_ACTIVE (1 << 4) /* not ready for write */ -#define TIMER_MATCH_W_ACTIVE (1 << 0) /* not ready for write */ - -#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t) - -static void __iomem *regbase; - -static cycle_t vt8500_timer_read(struct clocksource *cs) -{ - int loops = msecs_to_loops(10); - writel(3, regbase + TIMER_CTRL_VAL); - while ((readl((regbase + TIMER_AS_VAL)) & TIMER_COUNT_R_ACTIVE) - && --loops) - cpu_relax(); - return readl(regbase + TIMER_COUNT_VAL); -} - -static struct clocksource clocksource = { - .name = "vt8500_timer", - .rating = 200, - .read = vt8500_timer_read, - .mask = CLOCKSOURCE_MASK(32), - .flags = CLOCK_SOURCE_IS_CONTINUOUS, -}; - -static int vt8500_timer_set_next_event(unsigned long cycles, - struct clock_event_device *evt) -{ - int loops = msecs_to_loops(10); - cycle_t alarm = clocksource.read(&clocksource) + cycles; - while ((readl(regbase + TIMER_AS_VAL) & TIMER_MATCH_W_ACTIVE) - && --loops) - cpu_relax(); - writel((unsigned long)alarm, regbase + TIMER_MATCH_VAL); - - if ((signed)(alarm - clocksource.read(&clocksource)) <= 16) - return -ETIME; - - writel(1, regbase + TIMER_IER_VAL); - - return 0; -} - -static void vt8500_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt) -{ - switch (mode) { - case CLOCK_EVT_MODE_RESUME: - case CLOCK_EVT_MODE_PERIODIC: - break; - case CLOCK_EVT_MODE_ONESHOT: - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - writel(readl(regbase + TIMER_CTRL_VAL) | 1, - regbase + TIMER_CTRL_VAL); - writel(0, regbase + TIMER_IER_VAL); - break; - } -} - -static struct clock_event_device clockevent = { - .name = "vt8500_timer", - .features = CLOCK_EVT_FEAT_ONESHOT, - .rating = 200, - .set_next_event = vt8500_timer_set_next_event, - .set_mode = vt8500_timer_set_mode, -}; - -static irqreturn_t vt8500_timer_interrupt(int irq, void *dev_id) -{ - struct clock_event_device *evt = dev_id; - writel(0xf, regbase + TIMER_STATUS_VAL); - evt->event_handler(evt); - - return IRQ_HANDLED; -} - -static struct irqaction irq = { - .name = "vt8500_timer", - .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, - .handler = vt8500_timer_interrupt, - .dev_id = &clockevent, -}; - -static struct of_device_id vt8500_timer_ids[] = { - { .compatible = "via,vt8500-timer" }, - { } -}; - -void __init vt8500_timer_init(void) -{ - struct device_node *np; - int timer_irq; - - np = of_find_matching_node(NULL, vt8500_timer_ids); - if (!np) { - pr_err("%s: Timer description missing from Device Tree\n", - __func__); - return; - } - regbase = of_iomap(np, 0); - if (!regbase) { - pr_err("%s: Missing iobase description in Device Tree\n", - __func__); - of_node_put(np); - return; - } - timer_irq = irq_of_parse_and_map(np, 0); - if (!timer_irq) { - pr_err("%s: Missing irq description in Device Tree\n", - __func__); - of_node_put(np); - return; - } - - writel(1, regbase + TIMER_CTRL_VAL); - writel(0xf, regbase + TIMER_STATUS_VAL); - writel(~0, regbase + TIMER_MATCH_VAL); - - if (clocksource_register_hz(&clocksource, VT8500_TIMER_HZ)) - pr_err("%s: vt8500_timer_init: clocksource_register failed for %s\n", - __func__, clocksource.name); - - clockevents_calc_mult_shift(&clockevent, VT8500_TIMER_HZ, 4); - - /* copy-pasted from mach-msm; no idea */ - clockevent.max_delta_ns = - clockevent_delta2ns(0xf0000000, &clockevent); - clockevent.min_delta_ns = clockevent_delta2ns(4, &clockevent); - clockevent.cpumask = cpumask_of(0); - - if (setup_irq(timer_irq, &irq)) - pr_err("%s: setup_irq failed for %s\n", __func__, - clockevent.name); - clockevents_register_device(&clockevent); -} - diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index d5b9c66..b9fd9d3 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c @@ -20,6 +20,7 @@ #include <linux/io.h> #include <linux/pm.h> +#include <linux/vt8500_timer.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index a32b7a9..7d978c1 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -28,6 +28,9 @@ config ARMADA_370_XP_TIMER config SUNXI_TIMER bool +config VT8500_TIMER + bool + config CLKSRC_NOMADIK_MTU bool depends on (ARCH_NOMADIK || ARCH_U8500) diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index a33f792..440449c 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -17,5 +17,6 @@ obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o +obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c new file mode 100644 index 0000000..3dd21a4 --- /dev/null +++ b/drivers/clocksource/vt8500_timer.c @@ -0,0 +1,184 @@ +/* + * arch/arm/mach-vt8500/timer.c + * + * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> + * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * This file is copied and modified from the original timer.c provided by + * Alexey Charkov. Minor changes have been made for Device Tree Support. + */ + +#include <linux/io.h> +#include <linux/irq.h> +#include <linux/interrupt.h> +#include <linux/clocksource.h> +#include <linux/clockchips.h> +#include <linux/delay.h> +#include <asm/mach/time.h> + +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> + +#define VT8500_TIMER_OFFSET 0x0100 +#define VT8500_TIMER_HZ 3000000 +#define TIMER_MATCH_VAL 0x0000 +#define TIMER_COUNT_VAL 0x0010 +#define TIMER_STATUS_VAL 0x0014 +#define TIMER_IER_VAL 0x001c /* interrupt enable */ +#define TIMER_CTRL_VAL 0x0020 +#define TIMER_AS_VAL 0x0024 /* access status */ +#define TIMER_COUNT_R_ACTIVE (1 << 5) /* not ready for read */ +#define TIMER_COUNT_W_ACTIVE (1 << 4) /* not ready for write */ +#define TIMER_MATCH_W_ACTIVE (1 << 0) /* not ready for write */ + +#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t) + +static void __iomem *regbase; + +static cycle_t vt8500_timer_read(struct clocksource *cs) +{ + int loops = msecs_to_loops(10); + writel(3, regbase + TIMER_CTRL_VAL); + while ((readl((regbase + TIMER_AS_VAL)) & TIMER_COUNT_R_ACTIVE) + && --loops) + cpu_relax(); + return readl(regbase + TIMER_COUNT_VAL); +} + +static struct clocksource clocksource = { + .name = "vt8500_timer", + .rating = 200, + .read = vt8500_timer_read, + .mask = CLOCKSOURCE_MASK(32), + .flags = CLOCK_SOURCE_IS_CONTINUOUS, +}; + +static int vt8500_timer_set_next_event(unsigned long cycles, + struct clock_event_device *evt) +{ + int loops = msecs_to_loops(10); + cycle_t alarm = clocksource.read(&clocksource) + cycles; + while ((readl(regbase + TIMER_AS_VAL) & TIMER_MATCH_W_ACTIVE) + && --loops) + cpu_relax(); + writel((unsigned long)alarm, regbase + TIMER_MATCH_VAL); + + if ((signed)(alarm - clocksource.read(&clocksource)) <= 16) + return -ETIME; + + writel(1, regbase + TIMER_IER_VAL); + + return 0; +} + +static void vt8500_timer_set_mode(enum clock_event_mode mode, + struct clock_event_device *evt) +{ + switch (mode) { + case CLOCK_EVT_MODE_RESUME: + case CLOCK_EVT_MODE_PERIODIC: + break; + case CLOCK_EVT_MODE_ONESHOT: + case CLOCK_EVT_MODE_UNUSED: + case CLOCK_EVT_MODE_SHUTDOWN: + writel(readl(regbase + TIMER_CTRL_VAL) | 1, + regbase + TIMER_CTRL_VAL); + writel(0, regbase + TIMER_IER_VAL); + break; + } +} + +static struct clock_event_device clockevent = { + .name = "vt8500_timer", + .features = CLOCK_EVT_FEAT_ONESHOT, + .rating = 200, + .set_next_event = vt8500_timer_set_next_event, + .set_mode = vt8500_timer_set_mode, +}; + +static irqreturn_t vt8500_timer_interrupt(int irq, void *dev_id) +{ + struct clock_event_device *evt = dev_id; + writel(0xf, regbase + TIMER_STATUS_VAL); + evt->event_handler(evt); + + return IRQ_HANDLED; +} + +static struct irqaction irq = { + .name = "vt8500_timer", + .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, + .handler = vt8500_timer_interrupt, + .dev_id = &clockevent, +}; + +static struct of_device_id vt8500_timer_ids[] = { + { .compatible = "via,vt8500-timer" }, + { } +}; + +void __init vt8500_timer_init(void) +{ + struct device_node *np; + int timer_irq; + + np = of_find_matching_node(NULL, vt8500_timer_ids); + if (!np) { + pr_err("%s: Timer description missing from Device Tree\n", + __func__); + return; + } + regbase = of_iomap(np, 0); + if (!regbase) { + pr_err("%s: Missing iobase description in Device Tree\n", + __func__); + of_node_put(np); + return; + } + timer_irq = irq_of_parse_and_map(np, 0); + if (!timer_irq) { + pr_err("%s: Missing irq description in Device Tree\n", + __func__); + of_node_put(np); + return; + } + + writel(1, regbase + TIMER_CTRL_VAL); + writel(0xf, regbase + TIMER_STATUS_VAL); + writel(~0, regbase + TIMER_MATCH_VAL); + + if (clocksource_register_hz(&clocksource, VT8500_TIMER_HZ)) + pr_err("%s: vt8500_timer_init: clocksource_register failed for %s\n", + __func__, clocksource.name); + + clockevents_calc_mult_shift(&clockevent, VT8500_TIMER_HZ, 4); + + /* copy-pasted from mach-msm; no idea */ + clockevent.max_delta_ns = + clockevent_delta2ns(0xf0000000, &clockevent); + clockevent.min_delta_ns = clockevent_delta2ns(4, &clockevent); + clockevent.cpumask = cpumask_of(0); + + if (setup_irq(timer_irq, &irq)) + pr_err("%s: setup_irq failed for %s\n", __func__, + clockevent.name); + clockevents_register_device(&clockevent); +} + diff --git a/include/linux/vt8500_timer.h b/include/linux/vt8500_timer.h new file mode 100644 index 0000000..33b0ee8 --- /dev/null +++ b/include/linux/vt8500_timer.h @@ -0,0 +1,22 @@ +/* + * Copyright 2012 Tony Prisk <linux@prisktech.co.nz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __VT8500_TIMER_H +#define __VT8500_TIMER_H + +#include <asm/mach/time.h> + +void vt8500_timer_init(void); + +#endif -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Bulk] [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 5:09 ` [PATCH] " Tony Prisk @ 2013-01-14 5:13 ` Tony Prisk 2013-01-14 5:47 ` Tony Prisk 2013-01-14 16:34 ` Stephen Warren 1 sibling, 1 reply; 12+ messages in thread From: Tony Prisk @ 2013-01-14 5:13 UTC (permalink / raw) To: vt8500-wm8505-linux-kernel Cc: Olof Johansson, linux-kernel, linux-arm-kernel, arm On Mon, 2013-01-14 at 18:09 +1300, Tony Prisk wrote: > This patch moves arch-vt8500/timer.c into drivers/clocksource and > updates the necessary Kconfig/Makefile options. > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > --- > arch/arm/mach-vt8500/Kconfig | 1 + > arch/arm/mach-vt8500/Makefile | 2 +- > arch/arm/mach-vt8500/common.h | 1 - > arch/arm/mach-vt8500/timer.c | 184 ------------------------------------ > arch/arm/mach-vt8500/vt8500.c | 1 + > drivers/clocksource/Kconfig | 3 + > drivers/clocksource/Makefile | 1 + > drivers/clocksource/vt8500_timer.c | 184 ++++++++++++++++++++++++++++++++++++ > include/linux/vt8500_timer.h | 22 +++++ > 9 files changed, 213 insertions(+), 186 deletions(-) > delete mode 100644 arch/arm/mach-vt8500/timer.c > create mode 100644 drivers/clocksource/vt8500_timer.c > create mode 100644 include/linux/vt8500_timer.h Darn.. forgot the -m again. I'll await your feedback regarding the basing of the patch first (and any other feedback), then I'll redo it with the correct stats. Regards Tony P ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Bulk] [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 5:13 ` [Bulk] " Tony Prisk @ 2013-01-14 5:47 ` Tony Prisk 2013-01-14 5:53 ` Tony Prisk 2013-01-14 20:07 ` Olof Johansson 0 siblings, 2 replies; 12+ messages in thread From: Tony Prisk @ 2013-01-14 5:47 UTC (permalink / raw) To: Olof Johansson; +Cc: linux-kernel, linux-arm-kernel, arm, VT8500 Mailing List On Mon, 2013-01-14 at 18:13 +1300, Tony Prisk wrote: > On Mon, 2013-01-14 at 18:09 +1300, Tony Prisk wrote: > > This patch moves arch-vt8500/timer.c into drivers/clocksource and > > updates the necessary Kconfig/Makefile options. > > > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > > --- > > arch/arm/mach-vt8500/Kconfig | 1 + > > arch/arm/mach-vt8500/Makefile | 2 +- > > arch/arm/mach-vt8500/common.h | 1 - > > arch/arm/mach-vt8500/timer.c | 184 ------------------------------------ > > arch/arm/mach-vt8500/vt8500.c | 1 + > > drivers/clocksource/Kconfig | 3 + > > drivers/clocksource/Makefile | 1 + > > drivers/clocksource/vt8500_timer.c | 184 ++++++++++++++++++++++++++++++++++++ > > include/linux/vt8500_timer.h | 22 +++++ > > 9 files changed, 213 insertions(+), 186 deletions(-) > > delete mode 100644 arch/arm/mach-vt8500/timer.c > > create mode 100644 drivers/clocksource/vt8500_timer.c > > create mode 100644 include/linux/vt8500_timer.h > > Darn.. forgot the -m again. I'll await your feedback regarding the > basing of the patch first (and any other feedback), then I'll redo it > with the correct stats. > > Regards > Tony P Oh grr.. forget this completely. It doesn't take into account the patches I already sent for WM8850. I guess it needs to be based on timer/cleanup + vt8500/wm8x50. Need a little advise on how to handle this one please :) Regards Tony P ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Bulk] [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 5:47 ` Tony Prisk @ 2013-01-14 5:53 ` Tony Prisk 2013-01-14 20:07 ` Olof Johansson 1 sibling, 0 replies; 12+ messages in thread From: Tony Prisk @ 2013-01-14 5:53 UTC (permalink / raw) To: Olof Johansson; +Cc: linux-kernel, linux-arm-kernel, arm, VT8500 Mailing List > Oh grr.. forget this completely. It doesn't take into account the > patches I already sent for WM8850. > > I guess it needs to be based on timer/cleanup + vt8500/wm8x50. > > Need a little advise on how to handle this one please :) > > Regards > Tony P Turns out the original patch applies cleanly on timer/cleanup + vt8500/wm8x50 anyway so maybe it doesn't need to be rebased. Let me know if I need to do anything (other than the -m to cleanup the stats). Regards Tony P ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Bulk] [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 5:47 ` Tony Prisk 2013-01-14 5:53 ` Tony Prisk @ 2013-01-14 20:07 ` Olof Johansson 2013-01-15 4:12 ` Tony Prisk 1 sibling, 1 reply; 12+ messages in thread From: Olof Johansson @ 2013-01-14 20:07 UTC (permalink / raw) To: Tony Prisk; +Cc: linux-kernel, linux-arm-kernel, arm, VT8500 Mailing List On Mon, Jan 14, 2013 at 06:47:35PM +1300, Tony Prisk wrote: > On Mon, 2013-01-14 at 18:13 +1300, Tony Prisk wrote: > > On Mon, 2013-01-14 at 18:09 +1300, Tony Prisk wrote: > > > This patch moves arch-vt8500/timer.c into drivers/clocksource and > > > updates the necessary Kconfig/Makefile options. > > > > > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > > > --- > > > arch/arm/mach-vt8500/Kconfig | 1 + > > > arch/arm/mach-vt8500/Makefile | 2 +- > > > arch/arm/mach-vt8500/common.h | 1 - > > > arch/arm/mach-vt8500/timer.c | 184 ------------------------------------ > > > arch/arm/mach-vt8500/vt8500.c | 1 + > > > drivers/clocksource/Kconfig | 3 + > > > drivers/clocksource/Makefile | 1 + > > > drivers/clocksource/vt8500_timer.c | 184 ++++++++++++++++++++++++++++++++++++ > > > include/linux/vt8500_timer.h | 22 +++++ > > > 9 files changed, 213 insertions(+), 186 deletions(-) > > > delete mode 100644 arch/arm/mach-vt8500/timer.c > > > create mode 100644 drivers/clocksource/vt8500_timer.c > > > create mode 100644 include/linux/vt8500_timer.h > > > > Darn.. forgot the -m again. I'll await your feedback regarding the > > basing of the patch first (and any other feedback), then I'll redo it > > with the correct stats. > > > > Regards > > Tony P > > Oh grr.. forget this completely. It doesn't take into account the > patches I already sent for WM8850. > > I guess it needs to be based on timer/cleanup + vt8500/wm8x50. > > Need a little advise on how to handle this one please :) The normal way to handle these kind of dependencies is to base them on merges of the needed branches. Based on the later email, you only seem to need timer/cleanup, but if you would have needed the other one, then you'd merge that on top of timer/cleanup, and then add your patches. Of course, ideally you would do the cleanup, then add the wm8x50 features, but in reality work doesn't always pan out that way, so you end up with cleanups that depend on including new features in the same (sweeping) cleanup since they have already been merged. That's when things sometimes get hairy, and we need to start a second cleanup branch that's "after" the feature branch in the sequence of topics. But it should be rare, and in your case it seems like it wasn't needed. -Olof ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Bulk] [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 20:07 ` Olof Johansson @ 2013-01-15 4:12 ` Tony Prisk 2013-01-15 6:03 ` Olof Johansson 0 siblings, 1 reply; 12+ messages in thread From: Tony Prisk @ 2013-01-15 4:12 UTC (permalink / raw) To: Olof Johansson; +Cc: VT8500 Mailing List, arm, linux-kernel, linux-arm-kernel On Mon, 2013-01-14 at 12:07 -0800, Olof Johansson wrote: > On Mon, Jan 14, 2013 at 06:47:35PM +1300, Tony Prisk wrote: > > On Mon, 2013-01-14 at 18:13 +1300, Tony Prisk wrote: > > > On Mon, 2013-01-14 at 18:09 +1300, Tony Prisk wrote: > > > > This patch moves arch-vt8500/timer.c into drivers/clocksource and > > > > updates the necessary Kconfig/Makefile options. > > > > > > > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > > > > --- > > > > arch/arm/mach-vt8500/Kconfig | 1 + > > > > arch/arm/mach-vt8500/Makefile | 2 +- > > > > arch/arm/mach-vt8500/common.h | 1 - > > > > arch/arm/mach-vt8500/timer.c | 184 ------------------------------------ > > > > arch/arm/mach-vt8500/vt8500.c | 1 + > > > > drivers/clocksource/Kconfig | 3 + > > > > drivers/clocksource/Makefile | 1 + > > > > drivers/clocksource/vt8500_timer.c | 184 ++++++++++++++++++++++++++++++++++++ > > > > include/linux/vt8500_timer.h | 22 +++++ > > > > 9 files changed, 213 insertions(+), 186 deletions(-) > > > > delete mode 100644 arch/arm/mach-vt8500/timer.c > > > > create mode 100644 drivers/clocksource/vt8500_timer.c > > > > create mode 100644 include/linux/vt8500_timer.h > > > > > > Darn.. forgot the -m again. I'll await your feedback regarding the > > > basing of the patch first (and any other feedback), then I'll redo it > > > with the correct stats. > > > > > > Regards > > > Tony P > > > > Oh grr.. forget this completely. It doesn't take into account the > > patches I already sent for WM8850. > > > > I guess it needs to be based on timer/cleanup + vt8500/wm8x50. > > > > Need a little advise on how to handle this one please :) > > The normal way to handle these kind of dependencies is to base them on merges > of the needed branches. Based on the later email, you only seem to need > timer/cleanup, but if you would have needed the other one, then you'd merge > that on top of timer/cleanup, and then add your patches. > > Of course, ideally you would do the cleanup, then add the wm8x50 features, > but in reality work doesn't always pan out that way, so you end up with > cleanups that depend on including new features in the same (sweeping) > cleanup since they have already been merged. That's when things sometimes > get hairy, and we need to start a second cleanup branch that's "after" > the feature branch in the sequence of topics. But it should be rare, > and in your case it seems like it wasn't needed. > > > -Olof > Just to clarify what I did (and to make sure it was as you understood it): #1) I wrote the patch on top of timer/cleanup. This is the branch the patch was written for. #2) I then pulled timer/cleanup and merged vt8500/wm8x50 on top, then reapplied the patch from #1 - it applied cleanly. What I have just realised is that you might?? get a conflict when you merge vt8500/wm8x50 on top of wherever this patch ends up due to the few lines at the top of arch-vt8500/Kconfig having changed (the addition of SELECT VT8500_TIMER). This should be trivial to fix (I assume). Regards Tony P ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Bulk] [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-15 4:12 ` Tony Prisk @ 2013-01-15 6:03 ` Olof Johansson 0 siblings, 0 replies; 12+ messages in thread From: Olof Johansson @ 2013-01-15 6:03 UTC (permalink / raw) To: Tony Prisk; +Cc: VT8500 Mailing List, arm, linux-kernel, linux-arm-kernel On Mon, Jan 14, 2013 at 8:12 PM, Tony Prisk <linux@prisktech.co.nz> wrote: > On Mon, 2013-01-14 at 12:07 -0800, Olof Johansson wrote: >> On Mon, Jan 14, 2013 at 06:47:35PM +1300, Tony Prisk wrote: >> > On Mon, 2013-01-14 at 18:13 +1300, Tony Prisk wrote: >> > > On Mon, 2013-01-14 at 18:09 +1300, Tony Prisk wrote: >> > > > This patch moves arch-vt8500/timer.c into drivers/clocksource and >> > > > updates the necessary Kconfig/Makefile options. >> > > > >> > > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> >> > > > --- >> > > > arch/arm/mach-vt8500/Kconfig | 1 + >> > > > arch/arm/mach-vt8500/Makefile | 2 +- >> > > > arch/arm/mach-vt8500/common.h | 1 - >> > > > arch/arm/mach-vt8500/timer.c | 184 ------------------------------------ >> > > > arch/arm/mach-vt8500/vt8500.c | 1 + >> > > > drivers/clocksource/Kconfig | 3 + >> > > > drivers/clocksource/Makefile | 1 + >> > > > drivers/clocksource/vt8500_timer.c | 184 ++++++++++++++++++++++++++++++++++++ >> > > > include/linux/vt8500_timer.h | 22 +++++ >> > > > 9 files changed, 213 insertions(+), 186 deletions(-) >> > > > delete mode 100644 arch/arm/mach-vt8500/timer.c >> > > > create mode 100644 drivers/clocksource/vt8500_timer.c >> > > > create mode 100644 include/linux/vt8500_timer.h >> > > >> > > Darn.. forgot the -m again. I'll await your feedback regarding the >> > > basing of the patch first (and any other feedback), then I'll redo it >> > > with the correct stats. >> > > >> > > Regards >> > > Tony P >> > >> > Oh grr.. forget this completely. It doesn't take into account the >> > patches I already sent for WM8850. >> > >> > I guess it needs to be based on timer/cleanup + vt8500/wm8x50. >> > >> > Need a little advise on how to handle this one please :) >> >> The normal way to handle these kind of dependencies is to base them on merges >> of the needed branches. Based on the later email, you only seem to need >> timer/cleanup, but if you would have needed the other one, then you'd merge >> that on top of timer/cleanup, and then add your patches. >> >> Of course, ideally you would do the cleanup, then add the wm8x50 features, >> but in reality work doesn't always pan out that way, so you end up with >> cleanups that depend on including new features in the same (sweeping) >> cleanup since they have already been merged. That's when things sometimes >> get hairy, and we need to start a second cleanup branch that's "after" >> the feature branch in the sequence of topics. But it should be rare, >> and in your case it seems like it wasn't needed. >> >> >> -Olof >> > > Just to clarify what I did (and to make sure it was as you understood > it): > > #1) I wrote the patch on top of timer/cleanup. This is the branch the > patch was written for. > > #2) I then pulled timer/cleanup and merged vt8500/wm8x50 on top, then > reapplied the patch from #1 - it applied cleanly. > > What I have just realised is that you might?? get a conflict when you > merge vt8500/wm8x50 on top of wherever this patch ends up due to the few > lines at the top of arch-vt8500/Kconfig having changed (the addition of > SELECT VT8500_TIMER). This should be trivial to fix (I assume). Yeah, a couple of trivial conflicts are fine, but when they start to stack up we normally have to push back since some of these are exposed all the way up to Linus. We can also be a little more strategic in how we chose to pick bases for the topic branches to avoid some of this, which is what I intend to do this release cycle if it pans out. In this case, there are no manual conflict resolution to be done, everything panned out just fine as it was. -Olof ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 5:09 ` [PATCH] " Tony Prisk 2013-01-14 5:13 ` [Bulk] " Tony Prisk @ 2013-01-14 16:34 ` Stephen Warren 2013-01-15 4:53 ` Tony Prisk 1 sibling, 1 reply; 12+ messages in thread From: Stephen Warren @ 2013-01-14 16:34 UTC (permalink / raw) To: Tony Prisk Cc: Olof Johansson, linux-kernel, linux-arm-kernel, vt8500-wm8505-linux-kernel, arm On 01/13/2013 10:09 PM, Tony Prisk wrote: > This patch moves arch-vt8500/timer.c into drivers/clocksource and > updates the necessary Kconfig/Makefile options. > diff --git a/include/linux/vt8500_timer.h b/include/linux/vt8500_timer.h > +#ifndef __VT8500_TIMER_H > +#define __VT8500_TIMER_H > + > +#include <asm/mach/time.h> > + > +void vt8500_timer_init(void); > + > +#endif Is VT8500 DT-only? If so, it'd be nice not to add this header, but instead use CLOCKSOURCE_OF_DECLARE() inside the driver C file. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 16:34 ` Stephen Warren @ 2013-01-15 4:53 ` Tony Prisk 2013-01-15 5:59 ` Olof Johansson 0 siblings, 1 reply; 12+ messages in thread From: Tony Prisk @ 2013-01-15 4:53 UTC (permalink / raw) To: Stephen Warren Cc: Olof Johansson, linux-kernel, linux-arm-kernel, vt8500-wm8505-linux-kernel, arm On Mon, 2013-01-14 at 09:34 -0700, Stephen Warren wrote: > On 01/13/2013 10:09 PM, Tony Prisk wrote: > > This patch moves arch-vt8500/timer.c into drivers/clocksource and > > updates the necessary Kconfig/Makefile options. > > > diff --git a/include/linux/vt8500_timer.h b/include/linux/vt8500_timer.h > > > +#ifndef __VT8500_TIMER_H > > +#define __VT8500_TIMER_H > > + > > +#include <asm/mach/time.h> > > + > > +void vt8500_timer_init(void); > > + > > +#endif > > Is VT8500 DT-only? If so, it'd be nice not to add this header, but > instead use CLOCKSOURCE_OF_DECLARE() inside the driver C file. Agreed - I didn't like the header when I added it but I didn't know of another way and based in on the sunxi code. Unfortunately Olof already pulled it into arm-soc, so I will try get another patch done to undo it :) Regards Tony P ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] timer: vt8500: Move timer code to drivers/clocksource 2013-01-15 4:53 ` Tony Prisk @ 2013-01-15 5:59 ` Olof Johansson 0 siblings, 0 replies; 12+ messages in thread From: Olof Johansson @ 2013-01-15 5:59 UTC (permalink / raw) To: Tony Prisk Cc: Stephen Warren, linux-kernel, linux-arm-kernel, vt8500-wm8505-linux-kernel, arm On Mon, Jan 14, 2013 at 8:53 PM, Tony Prisk <linux@prisktech.co.nz> wrote: > On Mon, 2013-01-14 at 09:34 -0700, Stephen Warren wrote: >> On 01/13/2013 10:09 PM, Tony Prisk wrote: >> > This patch moves arch-vt8500/timer.c into drivers/clocksource and >> > updates the necessary Kconfig/Makefile options. >> >> > diff --git a/include/linux/vt8500_timer.h b/include/linux/vt8500_timer.h >> >> > +#ifndef __VT8500_TIMER_H >> > +#define __VT8500_TIMER_H >> > + >> > +#include <asm/mach/time.h> >> > + >> > +void vt8500_timer_init(void); >> > + >> > +#endif >> >> Is VT8500 DT-only? If so, it'd be nice not to add this header, but >> instead use CLOCKSOURCE_OF_DECLARE() inside the driver C file. > > Agreed - I didn't like the header when I added it but I didn't know of > another way and based in on the sunxi code. > > Unfortunately Olof already pulled it into arm-soc, so I will try get > another patch done to undo it :) Ack, I saw the comments but somehow blanked when it came to pulling it. Incremental patches on top are fine though. Sorry Stephen, I didn't mean to ignore your comments. :) -Olof ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL] timer: vt8500: Move timer code to drivers/clocksource 2013-01-14 5:09 [GIT PULL] timer: vt8500: Move timer code to drivers/clocksource Tony Prisk 2013-01-14 5:09 ` [PATCH] " Tony Prisk @ 2013-01-14 22:16 ` Olof Johansson 1 sibling, 0 replies; 12+ messages in thread From: Olof Johansson @ 2013-01-14 22:16 UTC (permalink / raw) To: Tony Prisk Cc: linux-kernel, linux-arm-kernel, vt8500-wm8505-linux-kernel, arm On Mon, Jan 14, 2013 at 06:09:30PM +1300, Tony Prisk wrote: > Hi Olof, > > Not sure if I have done this correctly but this is the patch to move the > vt8500/timer.c code into drivers/clocksource. > > I based it on timer/cleanup from armsoc (hopefully this is right - if not, a > few pointers in the right direction would be appreciated). > > Regards > Tony P > > > The following changes since commit 1c2584c3a1c882fec729147a46d822522552e38c: > > ARM: sunxi: fix struct sys_timer removal (2013-01-08 10:50:43 -0800) > > are available in the git repository at: > > git://server.prisktech.co.nz/git/linuxwmt.git tags/vt8500/timer Thanks, pulled and merged into next/cleanup. -Olof ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2013-01-15 6:03 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-01-14 5:09 [GIT PULL] timer: vt8500: Move timer code to drivers/clocksource Tony Prisk 2013-01-14 5:09 ` [PATCH] " Tony Prisk 2013-01-14 5:13 ` [Bulk] " Tony Prisk 2013-01-14 5:47 ` Tony Prisk 2013-01-14 5:53 ` Tony Prisk 2013-01-14 20:07 ` Olof Johansson 2013-01-15 4:12 ` Tony Prisk 2013-01-15 6:03 ` Olof Johansson 2013-01-14 16:34 ` Stephen Warren 2013-01-15 4:53 ` Tony Prisk 2013-01-15 5:59 ` Olof Johansson 2013-01-14 22:16 ` [GIT PULL] " Olof Johansson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).