| Message ID | 1393536486-3827-4-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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) We plan on re-alphabetizing next window to prevent bad conflicts in this window. thx, Jason.
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
On Thu, Feb 27, 2014 at 10:43:59PM +0100, Sebastian Hesselbarth wrote: > 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. Ok, then there's no need for 'dove :=', just s/ARCH_DOVE/MACH_DOVE/ on the original without movement. thx, Jason.
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 dtb-$(CONFIG_ARCH_MXC) += \ imx25-karo-tx25.dtb \ imx25-pdk.dtb \ diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig index 0bc7cdf8cf46..d8c439c89ea9 100644 --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -20,18 +20,6 @@ config MACH_CM_A510 Say 'Y' here if you want your kernel to support the CompuLab CM-A510 Board. -config MACH_DOVE_DT - bool "Marvell Dove Flattened Device Tree" - select DOVE_CLK - select ORION_IRQCHIP - select ORION_TIMER - select REGULATOR - select REGULATOR_FIXED_VOLTAGE - select USE_OF - help - Say 'Y' here if you want your kernel to support the - Marvell Dove using flattened device tree. - endmenu endif diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index cbc5c0618788..b608a21919fb 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -2,5 +2,4 @@ obj-y += common.o obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o -obj-$(CONFIG_MACH_DOVE_DT) += board-dt.o obj-$(CONFIG_MACH_CM_A510) += cm-a510.o diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 5e269d7263ce..966e5c6b9944 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -46,6 +46,18 @@ config MACH_ARMADA_XP Say 'Y' here if you want your kernel to support boards based on the Marvell Armada XP SoC with device tree. +config MACH_DOVE + bool "Marvell Dove boards" if ARCH_MULTI_V7 + select CACHE_L2X0 + select CPU_PJ4 + select DOVE_CLK + select ORION_IRQCHIP + select ORION_TIMER + select PINCTRL_DOVE + help + Say 'Y' here if you want your kernel to support the + Marvell Dove using flattened device tree. + endmenu endif diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 878aebe98dcc..dd3e7188f75d 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -5,6 +5,7 @@ AFLAGS_coherency_ll.o := -Wa,-march=armv7-a obj-y += system-controller.o mvebu-soc-id.o obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o +obj-$(CONFIG_MACH_DOVE) += dove.o obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-mvebu/dove.c similarity index 61% rename from arch/arm/mach-dove/board-dt.c rename to arch/arm/mach-mvebu/dove.c index 49fa9abd09da..5e5a43624237 100644 --- a/arch/arm/mach-dove/board-dt.c +++ b/arch/arm/mach-mvebu/dove.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-dove/board-dt.c + * arch/arm/mach-mvebu/dove.c * * Marvell Dove 88AP510 System On Chip FDT Board * @@ -9,17 +9,14 @@ */ #include <linux/init.h> -#include <linux/clk-provider.h> +#include <linux/mbus.h> #include <linux/of.h> #include <linux/of_platform.h> #include <asm/hardware/cache-tauros2.h> #include <asm/mach/arch.h> -#include <mach/dove.h> -#include <mach/pm.h> -#include <plat/common.h> #include "common.h" -static void __init dove_dt_init(void) +static void __init dove_init(void) { pr_info("Dove 88AP510 SoC\n"); @@ -30,14 +27,13 @@ static void __init dove_dt_init(void) of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } -static const char * const dove_dt_board_compat[] = { +static const char * const dove_dt_compat[] = { "marvell,dove", NULL }; -DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)") - .map_io = dove_map_io, - .init_machine = dove_dt_init, - .restart = dove_restart, - .dt_compat = dove_dt_board_compat, +DT_MACHINE_START(DOVE_DT, "Marvell Dove") + .init_machine = dove_init, + .restart = mvebu_restart, + .dt_compat = dove_dt_compat, MACHINE_END diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index c7a551c2d5f1..ffd7f07adca3 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -24,7 +24,7 @@ config PHY_EXYNOS_MIPI_VIDEO config PHY_MVEBU_SATA def_bool y - depends on ARCH_KIRKWOOD || ARCH_DOVE + depends on ARCH_KIRKWOOD || MACH_DOVE depends on OF select GENERIC_PHY
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%)