From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751839AbaB0VlI (ORCPT ); Thu, 27 Feb 2014 16:41:08 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:25198 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750999AbaB0VlF (ORCPT ); Thu, 27 Feb 2014 16:41:05 -0500 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19ANq5o73/rwkmqXHZEPYe2SsS1aMk36aM= X-DKIM: OpenDKIM Filter v2.0.1 titan 39AC3535C96 Date: Thu, 27 Feb 2014 16:40:39 -0500 From: Jason Cooper To: Sebastian Hesselbarth Cc: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Andrew Lunn , Gregory Clement , Kishon Vijay Abraham I , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4] ARM: mvebu: move DT Dove to MVEBU Message-ID: <20140227214039.GJ1872@titan.lakedaemon.net> References: <1393536486-3827-1-git-send-email-sebastian.hesselbarth@gmail.com> <1393536486-3827-4-git-send-email-sebastian.hesselbarth@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1393536486-3827-4-git-send-email-sebastian.hesselbarth@gmail.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > Cc: Rob Herring > Cc: Pawel Moll > Cc: Mark Rutland > Cc: Ian Campbell > Cc: Kumar Gala > Cc: Russell King > Cc: Jason Cooper > Cc: Andrew Lunn > Cc: Gregory Clement > Cc: Kishon Vijay Abraham I > Cc: devicetree@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > 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) We plan on re-alphabetizing next window to prevent bad conflicts in this window. thx, Jason. From mboxrd@z Thu Jan 1 00:00:00 1970 From: jason@lakedaemon.net (Jason Cooper) Date: Thu, 27 Feb 2014 16:40:39 -0500 Subject: [PATCH 3/4] ARM: mvebu: move DT Dove to MVEBU In-Reply-To: <1393536486-3827-4-git-send-email-sebastian.hesselbarth@gmail.com> References: <1393536486-3827-1-git-send-email-sebastian.hesselbarth@gmail.com> <1393536486-3827-4-git-send-email-sebastian.hesselbarth@gmail.com> Message-ID: <20140227214039.GJ1872@titan.lakedaemon.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > --- > Cc: Rob Herring > Cc: Pawel Moll > Cc: Mark Rutland > Cc: Ian Campbell > Cc: Kumar Gala > Cc: Russell King > Cc: Jason Cooper > Cc: Andrew Lunn > Cc: Gregory Clement > Cc: Kishon Vijay Abraham I > Cc: devicetree at vger.kernel.org > Cc: linux-arm-kernel at lists.infradead.org > Cc: linux-kernel at vger.kernel.org > --- > 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) We plan on re-alphabetizing next window to prevent bad conflicts in this window. thx, Jason.