summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/armada-xp-axpwifiap.dts
diff options
context:
space:
mode:
authorArnaud Ebalard <arno@natisbad.org>2014-11-22 00:46:39 +0100
committerJason Cooper <jason@lakedaemon.net>2014-11-22 04:35:41 +0000
commit547c653b64022618250ca9c7c30151927509ae98 (patch)
tree2f55c56754c83e202e01012905ac0123d19dedda /arch/arm/boot/dts/armada-xp-axpwifiap.dts
parentd352f41e87e7226692d1346bb97c603615eeb817 (diff)
downloadop-kernel-dev-547c653b64022618250ca9c7c30151927509ae98.zip
op-kernel-dev-547c653b64022618250ca9c7c30151927509ae98.tar.gz
arm: mvebu: define and use common Armada XP SPI pinctrl setting
This patch defines common Armada XP pinctrl settings in armada-xp.dtsi for the supported SPI interface (MPP36-39) and use it as default for Armada XP spi interface. That being done, it removes the now redundant definitions in armada-xp-axpwifiap.dts. Note: this patch has the potential to break out-of-tree users w/o specific pinctrl settings for their spi interfaces if the default above does not match their config (i.e. if they do not use CS0). Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Link: https://lkml.kernel.org/r/d404b7abd80ee5a0fd8e8d3586d33cd37740d589.1416613429.git.arno@natisbad.org Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-xp-axpwifiap.dts')
-rw-r--r--arch/arm/boot/dts/armada-xp-axpwifiap.dts7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index 0e53fad..c9d25bd 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -100,8 +100,6 @@
spi0: spi@10600 {
status = "okay";
- pinctrl-0 = <&pmx_spi>;
- pinctrl-names = "default";
spi-flash@0 {
#address-cells = <1>;
@@ -138,11 +136,6 @@
marvell,function = "gpio";
};
- pmx_spi: pmx-spi {
- marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
- marvell,function = "spi";
- };
-
pmx_phy_int: pmx-phy-int {
marvell,pins = "mpp32";
marvell,function = "gpio";
OpenPOWER on IntegriCloud