Skip to contentSkip to conversation

ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename

PATCH New Thomas Petazzoni 2 participants 2 messages Jun 11, 2015 – Jun 17, 2015 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename

Following the merge of "pinctrl: mvebu: armada-xp: rename spi to spi0" by Linus Walleij, we need to adjust the Armada XP Device Tree accordingly, by adjusting the pinctrl configuration for SPI pins.

---
 arch/arm/boot/dts/armada-xp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/armada-xp.dtsi +1 -1
index 013d63f..dba8d3f 100644
@@ -289,7 +289,7 @@
 	spi0_pins: spi0-pins {
 		marvell,pins = "mpp36", "mpp37",
 			       "mpp38", "mpp39";
-		marvell,function = "spi";
+		marvell,function = "spi0";
 	};
 
 	uart2_pins: uart2-pins {
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename

Hi Thomas, Arnd, Olof,

Quoted 5 lines · Thomas Petazzoni

Following the merge of "pinctrl: mvebu: armada-xp: rename spi to spi0" by Linus Walleij, we need to adjust the Armada XP Device Tree accordingly, by adjusting the pinctrl configuration for SPI pins.

applied on mvebu/dt with the hope that it could be merged for 4.2 in order to avoid breakage.

Thanks,

Gregory

Quoted 18 lines
---
 arch/arm/boot/dts/armada-xp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/armada-xp.dtsi +1 -1
index 013d63f..dba8d3f 100644
@@ -289,7 +289,7 @@
 	spi0_pins: spi0-pins {
 		marvell,pins = "mpp36", "mpp37",
 			       "mpp38", "mpp39";
-		marvell,function = "spi";
+		marvell,function = "spi0";
 	};
 
 	uart2_pins: uart2-pins {
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com