ARM: mvebu: fix build breaks from multi-platform conversion
Subsystems (4)
PATCH 1/1 ARM: mvebu: fix build breaks from multi-platform conversion
From: Rob Herring <[email protected]>
Moving ARCH_MVEBU for multi-platform support caused several breakages in recently added addr-map and pinctrl support for mvebu. This adds the necessary selects and include paths to fix the build.
--- arch/arm/mach-mvebu/Kconfig | 2 ++ arch/arm/mach-mvebu/Makefile | 3 ++- arch/arm/plat-orion/Makefile | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
arch/arm/mach-mvebu/Kconfig +2 -0
@@ -6,6 +6,8 @@ config ARCH_MVEBU select GENERIC_IRQ_CHIP select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select PINCTRL + select PLAT_ORION select SPARSE_IRQ if ARCH_MVEBU
arch/arm/mach-mvebu/Makefile +2 -1
@@ -1,4 +1,5 @@ -ccflags-$(ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ + -I$(srctree)/arch/arm/plat-orion/include obj-y += system-controller.o obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o
arch/arm/plat-orion/Makefile +1 -0
@@ -1,6 +1,7 @@ # # Makefile for the linux kernel. # +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include obj-y += addr-map.o
Signature · 1 line
1.7.9.5
PATCH 1/1 ARM: mvebu: fix build breaks from multi-platform conversion
Dear Rob Herring,
Quoted 22 lines · Rob Herring
From: Rob Herring <[email protected]>
Moving
ARCH_MVEBUfor multi-platform support caused several breakages in recently added addr-map and pinctrl support for mvebu. This adds the necessary selects and include paths to fix the build.Signed-off-by Rob Herring <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Gregory CLEMENT <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>--- arch/arm/mach-mvebu/Kconfig | 2 ++ arch/arm/mach-mvebu/Makefile | 3 ++- arch/arm/plat-orion/Makefile | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)arch/arm/mach-mvebu/Kconfig +0
-0
arch/arm/mach-mvebu/Kconfig config ARCH_MVEBU · line 9
Quoted 4 lines
arch/arm/mach-mvebu/Kconfig +1
-0@@ -6,6 +6,8 @@ config ARCH_MVEBU select GENERIC_IRQ_CHIP select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select PINCTRL
This select was already part added as a part of:
commit 7e8d941567c99a03390154a7bb116d1b03db82b3
Author: Sebastian Hesselbarth <[email protected]> Date: Thu Sep 13 17:41:43 2012 +0200
pinctrl: mvebu: pinctrl driver core
This patch adds a pinctrl driver core for Marvell SoCs plus DT binding documentation. This core driver will be used by SoC family specific drivers, i.e. Armada XP, Armada 370, Dove, Kirkwood, aso.
Conflicts:
arch/arm/Kconfig
which was requested for pull from the kirkwood/drivers branch of Jason Cooper repository. If it is no longer there, then it is a merge conflict resolution mistake.
arch/arm/mach-mvebu/Kconfig config ARCH_MVEBU · line 10
Quoted 1 line
arch/arm/mach-mvebu/Kconfig +1
-0+ select PLAT_ORION
This other select was already added as a part of:
commit abcda1dc3e23366c8543b372e9bf4e9086d5cca1
Author: Thomas Petazzoni <[email protected]> Date: Tue Sep 11 14:27:27 2012 +0200
arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option
Until now, the PLAT_ORION configuration option was common to all the Marvell EBU SoCs, and selecting this option had the effect of enabling the MPP code, GPIO code, address decoding and PCIe code from plat-orion, as well as providing access to driver-specific header files from plat-orion/include.
However, the Armada 370 and XP SoCs will not use the MPP and GPIO code (instead some proper pinctrl and gpio drivers are in preparation), and generally, we want to move away from plat-orion and instead have everything in mach-mvebu.
That said, in the mean time, we want to leverage the driver-specific headers as well as the address decoding code, so we introduce PLAT_ORION_LEGACY. The older Marvell SoCs need to select PLAT_ORION_LEGACY, while the newer Marvell SoCs need to select PLAT_ORION. Of course, when PLAT_ORION_LEGACY is selected, it automatically selects PLAT_ORION.
Then, with just PLAT_ORION, you have the address decoding code plus the driver-specific headers. If you add PLAT_ORION_LEGACY to this, you gain the old MPP, GPIO and PCIe code.
Again, this is only a temporary solution until we make all Marvell EBU platforms converge into the mach-mvebu directory. This solution avoids duplicating the existing address decoding code into mach-mvebu.
Coming from the kirkwood/addr_decode branch of Jason Cooper repository.
So it looks strange that you don't have both selects.
Otherwise, for the rest of patch:
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/1 ARM: mvebu: fix build breaks from multi-platform conversion
Quoted 19 lines · Thomas Petazzoni
This select was already part added as a part of:
commit
7e8d941567c99a03390154a7bb116d1b03db82b3Author: Sebastian Hesselbarth <[email protected]> Date: Thu Sep 13 17:41:43 2012 +0200pinctrl: mvebu: pinctrl driver core
This patch adds a pinctrl driver core for Marvell SoCs plus DT binding documentation. This core driver will be used by SoC family specific drivers, i.e. Armada XP, Armada 370, Dove, Kirkwood, aso.
Signed-off-by Sebastian Hesselbarth <[email protected]>Signed-off-by Thomas Petazzoni <[email protected]>Acked-by Thomas Petazzoni <[email protected]>Tested-by Thomas Petazzoni <[email protected]>Reviewed-by Stephen Warren <[email protected]>Signed-off-by Jason Cooper <[email protected]>
Quoted 7 lines
Conflicts:
arch/arm/Kconfigwhich was requested for pull from the kirkwood/drivers branch of Jason Cooper repository. If it is no longer there, then it is a merge conflict resolution mistake.
I believe it was lost again in the move to the multiplatform configuration, which moves the ARCH_MVEBU definition to arch/arm/mach-mvebu/Kconfig. automated merges with git don't notice this. Same for the other one.
Arnd
PATCH 1/1 ARM: mvebu: fix build breaks from multi-platform conversion
In reply to Rob HerringQuoted 11 lines · Rob Herring
From: Rob Herring <[email protected]>
Moving
ARCH_MVEBUfor multi-platform support caused several breakages in recently added addr-map and pinctrl support for mvebu. This adds the necessary selects and include paths to fix the build.Signed-off-by Rob Herring <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Gregory CLEMENT <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>
I actually had the same patch since monday but haven't managed to send out my series.
Olof probably has a better idea of how to apply this than me to avoid further merge conflicts.
Arnd
PATCH 1/1 ARM: mvebu: fix build breaks from multi-platform conversion
In reply to Rob HerringQuoted 11 lines · Rob Herring
From: Rob Herring <[email protected]>
Moving
ARCH_MVEBUfor multi-platform support caused several breakages in recently added addr-map and pinctrl support for mvebu. This adds the necessary selects and include paths to fix the build.Signed-off-by Rob Herring <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Gregory CLEMENT <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>
Applied on top of the late/kirkwood branch that introduced the incorrect merge.
Arnd
PATCH 1/1 ARM: mvebu: fix build breaks from multi-platform conversion
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · Rob Herring
From: Rob Herring <[email protected]>
Moving
ARCH_MVEBUfor multi-platform support caused several breakages in recently added addr-map and pinctrl support for mvebu. This adds the necessary selects and include paths to fix the build.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Rob Herring <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Gregory CLEMENT <[email protected]>Cc Jason Cooper <[email protected]>Cc Andrew Lunn <[email protected]>Applied on top of the late/kirkwood branch that introduced the incorrect merge.
Thanks Arnd!
-Olfo