From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: Jason Cooper <jason@lakedaemon.net>
Cc: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>,
Andrew Lunn <andrew@lunn.ch>,
Gregory Clement <gregory.clement@free-electrons.com>,
Kishon Vijay Abraham I <kishon@ti.com>,
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
Date: Thu, 27 Feb 2014 22:43:59 +0100 [thread overview]
Message-ID: <530FB19F.3050209@gmail.com> (raw)
In-Reply-To: <20140227214039.GJ1872@titan.lakedaemon.net>
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@gmail.com>
>> ---
>> Cc: Rob Herring <robh+dt@kernel.org>
>> Cc: Pawel Moll <pawel.moll@arm.com>
>> Cc: Mark Rutland <mark.rutland@arm.com>
>> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
>> Cc: Kumar Gala <galak@codeaurora.org>
>> Cc: Russell King <linux@arm.linux.org.uk>
>> Cc: Jason Cooper <jason@lakedaemon.net>
>> Cc: Andrew Lunn <andrew@lunn.ch>
>> Cc: Gregory Clement <gregory.clement@free-electrons.com>
>> Cc: Kishon Vijay Abraham I <kishon@ti.com>
>> 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)
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
next prev parent reply other threads:[~2014-02-27 21:44 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 21:28 [PATCH 0/4] ARM: dove: move Dove DT to MVEBU Sebastian Hesselbarth
2014-02-27 21:28 ` [PATCH 1/4] ARM: dove: add system controller node Sebastian Hesselbarth
2014-03-04 4:00 ` Jason Cooper
2014-02-27 21:28 ` [PATCH 2/4] ARM: dove: prepare new Dove DT Kconfig variable Sebastian Hesselbarth
2014-02-27 21:51 ` Wim Van Sebroeck
2014-02-27 22:05 ` Sebastian Hesselbarth
2014-02-28 1:53 ` Mark Brown
2014-02-28 16:34 ` Jason Cooper
2014-02-28 18:12 ` Sebastian Hesselbarth
2014-03-01 8:33 ` [PATCH v2 1/5] ASoC: kirkwood: " Sebastian Hesselbarth
2014-03-04 4:01 ` Jason Cooper
2014-03-04 4:03 ` Mark Brown
2014-03-04 10:32 ` Sebastian Hesselbarth
2014-03-01 8:33 ` [PATCH v2 2/5] watchdog: orion: " Sebastian Hesselbarth
2014-03-02 14:25 ` Wim Van Sebroeck
2014-03-04 4:02 ` Jason Cooper
2014-03-01 8:33 ` [PATCH v2 3/5] thermal: dove: " Sebastian Hesselbarth
2014-03-04 4:03 ` Jason Cooper
2014-03-20 5:57 ` Zhang Rui
2014-03-01 8:33 ` [PATCH v2 4/5] mmc: " Sebastian Hesselbarth
2014-03-04 4:03 ` Jason Cooper
2014-03-27 15:24 ` Sebastian Hesselbarth
2014-04-15 18:20 ` Sebastian Hesselbarth
2014-03-01 8:33 ` [PATCH v2 5/5] phy: mvebu-sata: " Sebastian Hesselbarth
2014-03-01 13:38 ` Kishon Vijay Abraham I
2014-03-02 20:47 ` Sebastian Hesselbarth
2014-03-04 4:04 ` Jason Cooper
2014-02-27 21:28 ` [PATCH 3/4] ARM: mvebu: move DT Dove to MVEBU Sebastian Hesselbarth
2014-02-27 21:40 ` Jason Cooper
2014-02-27 21:43 ` Sebastian Hesselbarth [this message]
2014-02-27 21:47 ` Jason Cooper
2014-02-27 22:03 ` [PATCH v2 " Sebastian Hesselbarth
2014-03-01 8:39 ` [PATCH v3 " Sebastian Hesselbarth
2014-03-04 4:29 ` Jason Cooper
2014-02-27 21:28 ` [PATCH 4/4] ARM: add Marvell Dove and some drivers to multi_v7 defconfig Sebastian Hesselbarth
2014-03-04 4:07 ` Jason Cooper
2014-03-17 15:29 ` Jason Cooper
2014-03-17 19:03 ` Arnd Bergmann
2014-02-27 21:45 ` [PATCH 0/4] ARM: dove: move Dove DT to MVEBU Jason Cooper
2014-02-27 21:48 ` Sebastian Hesselbarth
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=530FB19F.3050209@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=andrew@lunn.ch \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gregory.clement@free-electrons.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jason@lakedaemon.net \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.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;
as well as URLs for NNTP newsgroup(s).