From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 4/7 v4] ARM: kirkwood: add dreamplug (fdt) support.
Date: Tue, 13 Mar 2012 10:10:42 +0000 [thread overview]
Message-ID: <201203131010.43095.arnd@arndb.de> (raw)
In-Reply-To: <0032addd7e94c5d4d1a3a0be77fe79bcffee53db.1331601448.git.jason@lakedaemon.net>
On Tuesday 13 March 2012, Jason Cooper wrote:
> Initially, copied guruplug-setup.c and did s/guruplug/dreamplug/g.
> Then, switched to SPI based NOR flash.
>
> After talking to Arnd Bergman, chose an incremental approach to adding
> devicetree support. First, we use the dtb to tell us we are on the
> dreamplug, then we gradually port over drivers.
>
> Driver porting will start with the uart (see next patch), and progress
> from there. Next, all drivers not needing common clock (kirkwood_tclk)
> or pinmux. Then, remain drivers as that support hits the tree.
>
> We need to absorb kirkwood_init() into kirkwood_dt_init() so that as we
> convert drivers, we can remove the platform call, eg
> kirkwood_rtc_init(). This maintains compatibility with non-fdt
> configurations because they still call kirkwood_init() in common.c.
>
> As drivers are converted, we will reinstate the 'static' qualifier in
> common.c.
>
> Signed-off-by: Jason Cooper <jason@lakedaemon•net>
Patches 4 and 5 both look ok, but since I merged the earlier versions
of these into the stable next/board branch of arm-soc.git, you will have
to generate these as incremental patches now, and adapt the changeset
comments accordingly.
One small issue:
> --- a/arch/arm/mach-kirkwood/Kconfig
> +++ b/arch/arm/mach-kirkwood/Kconfig
> @@ -44,6 +44,20 @@ config MACH_GURUPLUG
> Say 'Y' here if you want your kernel to support the
> Marvell GuruPlug Reference Board.
>
> +config ARCH_KIRKWOOD_DT
> + bool "Marvell Kirkwood Flattened Device Tree"
> + select USE_OF
> + help
> + Say 'Y' here if you want your kernel to support the
> + Marvell Kirkwood using flattened device tree.
> +
> +config MACH_DREAMPLUG_DT
> + bool "Marvell DreamPlug (Flattened Device Tree)"
> + select ARCH_KIRKWOOD_DT
> + help
> + Say 'Y' here if you want your kernel to support the
> + Marvell DreamPlug (Flattened Device Tree).
> +
You allow ARCH_KIRKWOOD_DT to be enabled without also enabling
dreamplug. That is ok, but
> +
> + if (of_machine_is_compatible("globalscale,dreamplug"))
> + dreamplug_init();
> +
you call a function from dreamplug.o in board-dt.o and
> +/* board init functions for drivers not converted to fdt */
> +void dreamplug_init(void);
you have an unconditional forward declaration in the header.
The idiomatic way to deal with this is to replace turn the
declaration into
#ifdef CONFIG_DREAMPLUG_DT
void dreamplug_init(void);
#else
static inline void dreamplug_init(void) {}
#endif
Arnd
next prev parent reply other threads:[~2012-03-13 10:10 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-01 18:20 [PATCH 0/4] ARM: kirkwood: fdt: convert kirkwood init funcs to fdt Jason Cooper
2012-03-01 18:20 ` [PATCH 1/4] ARM: kirkwood: move var setting to correct location Jason Cooper
2012-03-01 18:20 ` [PATCH 2/4] ARM: kirkwood: fdt: absorb kirkwood_init() Jason Cooper
2012-03-02 7:09 ` Grant Likely
2012-03-01 18:20 ` [PATCH 3/4] ARM: kirkwood: convert rtc-mv to fdt Jason Cooper
2012-03-01 19:35 ` Arnd Bergmann
2012-03-01 21:26 ` Jason
2012-03-02 7:19 ` Grant Likely
2012-03-02 9:48 ` Arnd Bergmann
2012-03-02 16:27 ` Jason
2012-03-04 14:59 ` Michael Walle
2012-03-04 16:48 ` Arnd Bergmann
2012-03-04 22:27 ` Jason
2012-03-04 23:22 ` Michael Walle
2012-03-01 18:20 ` [PATCH 4/4] ARM: kirkwood: convert orion-wdt " Jason Cooper
2012-03-01 19:48 ` Arnd Bergmann
2012-03-02 7:22 ` Grant Likely
2012-03-02 9:15 ` Simon Guinot
2012-03-02 14:15 ` Jason
2012-03-02 14:56 ` Arnd Bergmann
2012-03-02 15:36 ` Jason
2012-03-02 16:48 ` Arnd Bergmann
2012-03-02 17:02 ` Jason
2012-03-02 22:36 ` Andrew Lunn
2012-03-03 22:54 ` Jason
2012-03-01 19:50 ` [PATCH 0/4] ARM: kirkwood: fdt: convert kirkwood init funcs " Arnd Bergmann
2012-03-01 20:01 ` Jason
2012-03-01 20:28 ` Arnd Bergmann
2012-03-01 21:23 ` Jason
2012-03-01 22:14 ` Arnd Bergmann
2012-03-02 16:31 ` Jason
2012-03-02 16:58 ` Arnd Bergmann
2012-03-02 17:04 ` Jason
2012-03-02 17:50 ` [PATCH 0/5 v2] " Jason Cooper
2012-03-02 17:50 ` [PATCH 1/5 v2] ARM: kirkwood: covert orion-spi " Jason Cooper
2012-03-04 18:12 ` Michael Walle
2012-03-04 20:29 ` Arnd Bergmann
2012-03-02 17:50 ` [PATCH 2/5] ARM: kirkwood: move var setting to correct location Jason Cooper
2012-03-02 17:50 ` [PATCH 3/5 v2] ARM: kirkwood: fdt: absorb kirkwood_init() Jason Cooper
2012-03-02 17:50 ` [PATCH 4/5 v2] ARM: kirkwood: convert rtc-mv to fdt Jason Cooper
2012-03-04 15:12 ` Michael Walle
2012-03-04 16:50 ` Arnd Bergmann
2012-03-05 0:17 ` Jason
2012-03-02 17:50 ` [PATCH 5/5 v2] ARM: kirkwood: convert orion-wdt " Jason Cooper
2012-03-02 18:32 ` Arnd Bergmann
2012-03-02 19:57 ` Jason
2012-03-02 20:02 ` Arnd Bergmann
[not found] ` <20120302200034.GQ11986@titan.lakedaemon.net>
2012-03-02 20:35 ` [PULL REQUEST v2] ARM: kirkwood: fdt: convert kirkwood init funcs " Arnd Bergmann
2012-03-02 21:18 ` Arnd Bergmann
2012-03-05 18:49 ` Nicolas Pitre
2012-03-05 19:15 ` Jason
2012-03-05 20:16 ` Arnd Bergmann
2012-03-05 20:29 ` Jason
2012-03-05 20:43 ` Nicolas Pitre
2012-03-05 21:17 ` Jason
2012-03-05 21:27 ` Nicolas Pitre
2012-03-06 14:29 ` Jason
2012-03-03 10:08 ` [PATCH 5/5 v2] ARM: kirkwood: convert orion-wdt " Russell King - ARM Linux
2012-03-03 23:05 ` Jason
2012-03-02 17:52 ` [PULL REQUEST] ARM: kirkwood: fdt: convert kirkwood init funcs " Jason
2012-03-02 17:56 ` Jason
2012-03-07 3:44 ` [PATCH 0/14 v3] ARM: kirkwood: fdt: convert kirkwood " Jason Cooper
2012-03-07 3:44 ` [PATCH 01/14] ARM: orion: spi: remove enable_clock_fix which is not used Jason Cooper
2012-03-09 4:33 ` Grant Likely
2012-03-07 3:44 ` [PATCH 02/14] ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data Jason Cooper
2012-03-07 3:44 ` [PATCH 03/14] ARM: kirkwood: add dreamplug (fdt) support Jason Cooper
2012-03-07 3:44 ` [PATCH 04/14] ARM: kirkwood: fdt: absorb kirkwood_init() Jason Cooper
2012-03-07 3:44 ` [PATCH 05/14] ARM: kirkwood: add interrupt controller to devicetree Jason Cooper
2012-03-07 3:44 ` [PATCH 06/14] ARM: kirkwood: convert uart0 " Jason Cooper
2012-03-07 18:31 ` Arnd Bergmann
2012-03-07 18:37 ` Jason
2012-03-07 19:27 ` Jason
2012-03-07 20:05 ` Andrew Lunn
2012-03-07 20:55 ` Jason
2012-03-07 21:13 ` Arnd Bergmann
2012-03-07 21:29 ` Jason
2012-03-08 16:25 ` Jason
2012-03-08 17:01 ` Arnd Bergmann
2012-03-08 17:41 ` Arnd Bergmann
2012-03-08 19:27 ` Thomas Gleixner
2012-03-08 19:47 ` Jason
2012-03-08 21:32 ` Grant Likely
2012-03-08 21:50 ` Jason
2012-03-08 22:22 ` Rob Herring
2012-03-08 21:27 ` Grant Likely
2012-03-08 23:14 ` Arnd Bergmann
2012-03-07 21:47 ` Michael Walle
2012-03-08 21:31 ` Grant Likely
2012-03-08 21:55 ` Jason
2012-03-07 3:44 ` [PATCH 07/14] ARM: kirkwood: rtc-mv devicetree bindings Jason Cooper
2012-03-07 3:44 ` [PATCH 08/14] ARM: kirkwood: use devicetree for rtc-mv Jason Cooper
2012-03-07 18:32 ` Arnd Bergmann
2012-03-07 3:44 ` [PATCH 09/14] ARM: kirkwood: mv_cesa devicetree bindings Jason Cooper
2012-03-07 3:44 ` [PATCH 10/14] ARM: kirkwood: mv_cesa devicetree support Jason Cooper
2012-03-07 3:44 ` [PATCH 11/14] ARM: kirkwood: ehci-orion: add device tree binding Jason Cooper
2012-03-07 3:44 ` [PATCH 12/14] ARM: kirkwood: use devicetree for orion-ehci Jason Cooper
2012-03-07 3:44 ` [PATCH 13/14] ARM: kirkwood: sata_mv: add device tree binding Jason Cooper
2012-03-07 3:44 ` [PATCH 14/14] ARM: kirkwood: use devicetree to init sata_mv Jason Cooper
2012-03-07 18:40 ` Arnd Bergmann
2012-03-07 18:52 ` Jason
2012-03-07 19:00 ` Arnd Bergmann
2012-03-13 1:57 ` [PATCH 0/7 v4] ARM: kirkwood: fdt: convert kirkwood to fdt Jason Cooper
2012-03-13 1:57 ` [PATCH 1/7] ARM: orion: spi: remove enable_clock_fix which is not used Jason Cooper
2012-03-13 1:57 ` [PATCH 2/7] ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data Jason Cooper
2012-03-13 1:57 ` [PATCH 3/7 v2] ARM: orion: wdt: use resource vice direct access Jason Cooper
2012-03-13 9:54 ` Arnd Bergmann
2012-03-13 1:57 ` [PATCH 4/7 v4] ARM: kirkwood: add dreamplug (fdt) support Jason Cooper
2012-03-13 10:10 ` Arnd Bergmann [this message]
2012-03-13 13:12 ` Jason Cooper
2012-04-05 22:07 ` Ian Campbell
2012-04-05 22:41 ` Jason Cooper
2012-04-06 8:52 ` Ian Campbell
[not found] ` <384286E8-E5C8-4069-9702-8A24C70D799C@gmail.com>
2012-04-16 13:27 ` dreamplug kernel and uboot code and apparent dreamplug board design change Jason Cooper
2012-03-13 1:57 ` [PATCH 5/7 v2] ARM: kirkwood: convert uart0 to devicetree Jason Cooper
2012-03-13 13:18 ` Jason Cooper
2012-03-13 1:57 ` [PATCH 6/7] ARM: kirkwood: rtc-mv devicetree bindings Jason Cooper
2012-03-13 9:57 ` Arnd Bergmann
2012-03-13 10:03 ` Uwe Kleine-König
2012-03-13 1:57 ` [PATCH 7/7] ARM: kirkwood: use devicetree for rtc-mv Jason Cooper
2012-03-13 9:58 ` Arnd Bergmann
2012-03-13 13:22 ` Jason Cooper
2012-03-13 13:44 ` Arnd Bergmann
2012-03-16 4:21 ` [PATCH 0/9 v5] ARM: kirkwood: fdt: convert kirkwood to fdt Jason Cooper
2012-03-16 4:21 ` [PATCH 1/9] ARM: orion: spi: remove enable_clock_fix which is not used Jason Cooper
2012-03-16 4:21 ` [PATCH 2/9] ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data Jason Cooper
2012-03-16 4:21 ` [PATCH 3/9 v3] ARM: orion: wdt: use resource vice direct access Jason Cooper
2012-03-16 4:21 ` [PATCH 4/9] ARM: kirkwood: fdt: use mrvl ticker symbol Jason Cooper
2012-03-16 4:21 ` [PATCH 5/9] ARM: kirkwood: fdt: absorb kirkwood_init() Jason Cooper
2012-03-16 4:21 ` [PATCH 6/9 v2] ARM: kirkwood: fdt: facilitate new boards during fdt migration Jason Cooper
2012-03-16 4:21 ` [PATCH 7/9] ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0 Jason Cooper
2012-03-16 4:21 ` [PATCH 8/9 v2] ARM: kirkwood: rtc-mv devicetree bindings Jason Cooper
2012-03-16 4:21 ` [PATCH 9/9] ARM: kirkwood: use devicetree for rtc-mv Jason Cooper
2012-03-16 20:18 ` [PATCH 0/9 v5] ARM: kirkwood: fdt: convert kirkwood to fdt Arnd Bergmann
2012-03-16 20:28 ` Jason Cooper
2012-03-16 20:41 ` Arnd Bergmann
2012-03-16 21:02 ` Jason Cooper
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=201203131010.43095.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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