Re: [PATCH 3/4] ARM: mvebu: move DT Dove to MVEBU

[Sebastian Hesselbarth]

On 02/27/2014 10:40 PM, Jason Cooper wrote:
> On Thu, Feb 27, 2014 at 10:28:04PM +0100, Sebastian Hesselbarth wrote:
> > With all the DT support preparation done, we are able to move Dove
> > to MVEBU easily. Legacy non-DT mach-dove is left untouched to rot
> > for a while before removal. Also, convert SATA PHY Kconfig entry,
> > which is DT-only.
> >
> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>
> > ---
> > Cc: Rob Herring <robh+dt@xxxxxxxxxx>
> > Cc: Pawel Moll <pawel.moll@xxxxxxx>
> > Cc: Mark Rutland <mark.rutland@xxxxxxx>
> > Cc: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx>
> > Cc: Kumar Gala <galak@xxxxxxxxxxxxxx>
> > Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
> > Cc: Jason Cooper <jason@xxxxxxxxxxxxxx>
> > Cc: Andrew Lunn <andrew@xxxxxxx>
> > Cc: Gregory Clement <gregory.clement@xxxxxxxxxxxxxxxxxx>
> > Cc: Kishon Vijay Abraham I <kishon@xxxxxx>
> > Cc: devicetree@xxxxxxxxxxxxxxx
> > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> > Cc: linux-kernel@xxxxxxxxxxxxxxx
> > ---
> >   arch/arm/boot/dts/Makefile                           | 12 ++++++------
> >   arch/arm/mach-dove/Kconfig                           | 12 ------------
> >   arch/arm/mach-dove/Makefile                          |  1 -
> >   arch/arm/mach-mvebu/Kconfig                          | 12 ++++++++++++
> >   arch/arm/mach-mvebu/Makefile                         |  1 +
> >   arch/arm/{mach-dove/board-dt.c => mach-mvebu/dove.c} | 20 ++++++++------------
> >   drivers/phy/Kconfig                                  |  2 +-
> >   7 files changed, 28 insertions(+), 32 deletions(-)
> >   rename arch/arm/{mach-dove/board-dt.c => mach-mvebu/dove.c} (61%)
> >
> > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > index 032030361bef..376a2573e500 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -55,11 +55,6 @@ dtb-$(CONFIG_ARCH_BERLIN) += \
> >   	berlin2cd-google-chromecast.dtb
> >   dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
> >   	da850-evm.dtb
> > -dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
> > -	dove-cubox.dtb \
> > -	dove-d2plug.dtb \
> > -	dove-d3plug.dtb \
> > -	dove-dove-db.dtb
> >   dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
> >   dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
> >   	exynos4210-smdkv310.dtb \
> > @@ -132,7 +127,12 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
> >   	armada-xp-gp.dtb \
> >   	armada-xp-netgear-rn2120.dtb \
> >   	armada-xp-matrix.dtb \
> > -	armada-xp-openblocks-ax3-4.dtb
> > +	armada-xp-openblocks-ax3-4.dtb \
> > +	dove-cm-a510.dtb \
> > +	dove-cubox.dtb \
> > +	dove-d2plug.dtb \
> > +	dove-d3plug.dtb \
> > +	dove-dove-db.dtb
>
> This is going to conflict badly with
>
>    a02dd0271d01 ARM: mvebu: select dtbs from MACH_ARMADA_*
>
> Perhaps you could mimic what Andrew did in his series:
>
> dove := dove-cm-a510.dtb \
> 	dove-cubox.dtb \
> 	dove-d2plug.dtb \
> 	dove-d3plug.dtb \
> 	dove-dove-db.dtb
> dtb-$(CONFIG_ARCH_DOVE) += $(dove)
> dtb-$(CONFIG_MACH_DOVE) += $(dove)

Ok, will do - except dtb-$(CONFIG_ARCH_DOVE) above.. there is no
DT in ARCH_DOVE after this patch.

> We plan on re-alphabetizing next window to prevent bad conflicts in this
> window.

Good!

Sebastian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/