Commit b72802c3 authored by Kevin Hilman's avatar Kevin Hilman

Merge tag 'mvebu-dt-4.2-3' of git://git.infradead.org/linux-mvebu into next/late

Merge "ARM: mvebu: dt changes for v4.2" from Gregory Clement

mvebu dt changes for v4.2 (part #3)

Update Armada XP DT spi muxing after pinctrl function rename which was
merged in the pinctrl subsystem for 4.2. Without it the spi muxing
will be broken in 4.2-rc1 for Armada XP.

* tag 'mvebu-dt-4.2-3' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename
parents 6540165c 8c19a731
......@@ -297,7 +297,7 @@ sdio_pins: sdio-pins {
spi0_pins: spi0-pins {
marvell,pins = "mpp36", "mpp37",
"mpp38", "mpp39";
marvell,function = "spi";
marvell,function = "spi0";
};
uart2_pins: uart2-pins {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment