summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-11 13:56:32 +0200
committerGregory CLEMENT <gregory.clement@free-electrons.com>2015-06-17 15:42:15 +0200
commit8c19a731a1a8b1f447a972174d2b2fe30d625518 (patch)
treea2c6c6623e970ba154c814c56bb01b0247832e43 /arch/arm
parent2d2959286017f5501187cfa47d3854f955c4beae (diff)
downloadblackbird-op-linux-8c19a731a1a8b1f447a972174d2b2fe30d625518.tar.gz
blackbird-op-linux-8c19a731a1a8b1f447a972174d2b2fe30d625518.zip
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. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/armada-xp.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index e78ce4ab6b75..58eaef46efd5 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -297,7 +297,7 @@
spi0_pins: spi0-pins {
marvell,pins = "mpp36", "mpp37",
"mpp38", "mpp39";
- marvell,function = "spi";
+ marvell,function = "spi0";
};
uart2_pins: uart2-pins {
OpenPOWER on IntegriCloud