From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/39] ARM: u300: device tree support for the timer
Date: Fri, 31 May 2013 12:31:41 +0200 [thread overview]
Message-ID: <7742928.6bJiIVUE0X@wuerfel> (raw)
In-Reply-To: <1369991954-17406-3-git-send-email-linus.walleij@stericsson.com>
On Friday 31 May 2013 11:18:37 Linus Walleij wrote:
> +
> +
> +void __init u300_timer_init()
> +{
> + u300_timer_setup(U300_TIMER_APP_VBASE, IRQ_U300_TIMER_APP_GP1);
> +}
> +
> +#ifdef CONFIG_OF
> +
> +static void __init u300_timer_init_of(struct device_node *np)
> +{
> + void __iomem *base;
> + struct resource irq_res;
> + int irq;
> +
> + base = of_iomap(np, 0);
> + /* Get the IRQ for the GP1 timer */
> + irq = of_irq_to_resource(np, 2, &irq_res);
> + u300_timer_setup(base, irq);
> +}
> +
> +CLOCKSOURCE_OF_DECLARE(u300_timer, "stericsson,u300-apptimer",
> + u300_timer_init_of);
> +
> +#endif
You should not need the CONFIG_OF #ifdef, since the CLOCKSOURCE_OF_DECLARE
macro is designed to let the function get dropped by the compiler when
that is not set.
You might want a CONFIG_ATAGS check for the other function though.
> diff --git a/arch/arm/mach-u300/timer.h b/arch/arm/mach-u300/timer.h
> index d34287b..7766dfa 100644
> --- a/arch/arm/mach-u300/timer.h
> +++ b/arch/arm/mach-u300/timer.h
> @@ -1 +1,2 @@
> extern void u300_timer_init(void);
> +
>
You probably didn't mean to include this newline.
Arnd
next prev parent reply other threads:[~2013-05-31 10:31 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-31 9:18 [PATCH 00/39] U300 device tree and multiplatform Linus Walleij
2013-05-31 9:18 ` [PATCH 01/39] ARM: u300: enable delaytimer on the U300 Linus Walleij
2013-05-31 9:18 ` [PATCH 02/39] ARM: u300: device tree support for the timer Linus Walleij
2013-05-31 10:31 ` Arnd Bergmann [this message]
2013-05-31 11:26 ` Linus Walleij
2013-05-31 13:53 ` Arnd Bergmann
2013-05-31 9:18 ` [PATCH 03/39] pinctrl: u300 device tree support Linus Walleij
2013-05-31 9:18 ` [PATCH 04/39] pinctrl: coh901: add " Linus Walleij
2013-05-31 9:18 ` [PATCH 05/39] ARM: u300: basic " Linus Walleij
2013-05-31 9:18 ` [PATCH 06/39] i2c: stu300: " Linus Walleij
2013-05-31 9:18 ` [PATCH 07/39] ARM: u300: register I2C bus drivers from device tree Linus Walleij
2013-05-31 9:18 ` [PATCH 08/39] watchdog: coh901327: devicetree support Linus Walleij
2013-05-31 9:18 ` [PATCH 09/39] ARM: u300: add the COH 901 327 watchdog to device tree Linus Walleij
2013-05-31 9:18 ` [PATCH 10/39] rtc: coh901331: add devicetree support Linus Walleij
2013-05-31 9:18 ` [PATCH 11/39] ARM: u300: add RTC to device tree Linus Walleij
2013-05-31 9:18 ` [PATCH 12/39] ARM: u300: set up board power from " Linus Walleij
2013-05-31 10:37 ` Arnd Bergmann
2013-05-31 11:33 ` Linus Walleij
2013-05-31 13:51 ` Arnd Bergmann
2013-05-31 14:02 ` Linus Walleij
2013-06-01 19:02 ` Mark Brown
2013-06-13 20:23 ` Linus Walleij
2013-05-31 9:18 ` [PATCH 13/39] ARM: u300: support regulators in the " Linus Walleij
2013-05-31 9:18 ` [PATCH 14/39] ARM: u300: enable MMC/SD card from " Linus Walleij
2013-05-31 9:18 ` [PATCH 15/39] dma: coh901318: add devicetree support Linus Walleij
2013-05-31 9:18 ` [PATCH 16/39] ARM: u300: augment device tree with DMA channels Linus Walleij
2013-05-31 9:18 ` [PATCH 17/39] ARM: u300: add the COH 901 318 DMAC to device tree Linus Walleij
2013-05-31 9:18 ` [PATCH 18/39] ARM: u300: add SPI PL022 to the " Linus Walleij
2013-05-31 9:18 ` [PATCH 19/39] ARM: u300: probe the U300 dummy-spichip from " Linus Walleij
2013-05-31 9:18 ` [PATCH 20/39] ARM: u300: add FSMC flash into the " Linus Walleij
2013-05-31 9:18 ` [PATCH 21/39] ARM: u300: delete all static board data Linus Walleij
2013-05-31 10:49 ` Arnd Bergmann
2013-05-31 12:45 ` Linus Walleij
2013-05-31 9:18 ` [PATCH 22/39] ARM: u300: move debugmacro to debug includes Linus Walleij
2013-05-31 9:18 ` [PATCH 23/39] ARM: u300: remove deps from debug macro Linus Walleij
2013-05-31 9:18 ` [PATCH 24/39] ARM: u300: push down syscon registers Linus Walleij
2013-05-31 9:19 ` [PATCH 25/39] ARM: u300: delete <mach/hardware.h> Linus Walleij
2013-05-31 9:19 ` [PATCH 26/39] ARM: u300: delete <mach/irqs.h> Linus Walleij
2013-05-31 9:19 ` [PATCH 27/39] ARM: u300: localize <mach/u300-regs.h> Linus Walleij
2013-05-31 9:19 ` [PATCH 28/39] ARM: u300: convert to multiplatform Linus Walleij
2013-05-31 9:19 ` [PATCH 29/39] ARM: u300: delete remnant machine headers Linus Walleij
2013-05-31 9:19 ` [PATCH 30/39] ARM: u300 use module_spi_driver to register driver Linus Walleij
2013-05-31 9:19 ` [PATCH 31/39] ARM: u300: add syscon node Linus Walleij
2013-05-31 10:47 ` Arnd Bergmann
2013-05-31 11:55 ` Linus Walleij
2013-06-03 2:28 ` Dong Aisheng
2013-06-13 20:24 ` Linus Walleij
2013-05-31 9:19 ` [PATCH 32/39] ARM: u300: remove register definition file Linus Walleij
2013-05-31 9:19 ` [PATCH 33/39] clk: move the U300 fixed and fixed-factor to DT Linus Walleij
2013-05-31 9:19 ` [PATCH 34/39] i2c: stu300: do not request a specific clock name Linus Walleij
2013-05-31 9:19 ` [PATCH 35/39] ARM: u300: move the gated system controller clocks to DT Linus Walleij
2013-05-31 9:19 ` [PATCH 36/39] ARM: u300: convert MMC/SD clock to device tree Linus Walleij
2013-05-31 9:19 ` [PATCH 37/39] pinctrl: get rid of all platform data for coh901 Linus Walleij
2013-05-31 9:19 ` [PATCH 38/39] spi: pl022: use DMA by default when probing from DT Linus Walleij
2013-05-31 9:19 ` [PATCH 39/39] ARM: u300: Update MMC configs for u300 defconfig Linus Walleij
2013-05-31 10:50 ` [PATCH 00/39] U300 device tree and multiplatform Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7742928.6bJiIVUE0X@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox