aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/armada-xp.dtsi
diff options
context:
space:
mode:
authorArnaud Ebalard <arno@natisbad.org>2014-11-21 18:46:39 -0500
committerJason Cooper <jason@lakedaemon.net>2014-11-21 23:35:41 -0500
commit547c653b64022618250ca9c7c30151927509ae98 (patch)
tree2f55c56754c83e202e01012905ac0123d19dedda /arch/arm/boot/dts/armada-xp.dtsi
parentd352f41e87e7226692d1346bb97c603615eeb817 (diff)
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.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-xp.dtsi11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 7cefb9b6d27c..bdb36a05c039 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -43,6 +43,11 @@
43 wt-override; 43 wt-override;
44 }; 44 };
45 45
46 spi0: spi@10600 {
47 pinctrl-0 = <&spi0_pins>;
48 pinctrl-names = "default";
49 };
50
46 i2c0: i2c@11000 { 51 i2c0: i2c@11000 {
47 compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; 52 compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
48 reg = <0x11000 0x100>; 53 reg = <0x11000 0x100>;
@@ -240,6 +245,12 @@
240 marvell,function = "sd0"; 245 marvell,function = "sd0";
241 }; 246 };
242 247
248 spi0_pins: spi0-pins {
249 marvell,pins = "mpp36", "mpp37",
250 "mpp38", "mpp39";
251 marvell,function = "spi";
252 };
253
243 uart2_pins: uart2-pins { 254 uart2_pins: uart2-pins {
244 marvell,pins = "mpp42", "mpp43"; 255 marvell,pins = "mpp42", "mpp43";
245 marvell,function = "uart2"; 256 marvell,function = "uart2";