diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-07-01 15:53:49 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-07-01 15:53:49 -0400 |
| commit | b72802c3117417ab696b0764d6e3cea369f578a6 (patch) | |
| tree | 54ba3c7f5145cb9bfdbecaee24540cfcfc5678d1 | |
| parent | 6540165cf41655810ee67b78f01537af022a636a (diff) | |
| parent | 8c19a731a1a8b1f447a972174d2b2fe30d625518 (diff) | |
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
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 |
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 @@ | |||
| 297 | spi0_pins: spi0-pins { | 297 | spi0_pins: spi0-pins { |
| 298 | marvell,pins = "mpp36", "mpp37", | 298 | marvell,pins = "mpp36", "mpp37", |
| 299 | "mpp38", "mpp39"; | 299 | "mpp38", "mpp39"; |
| 300 | marvell,function = "spi"; | 300 | marvell,function = "spi0"; |
| 301 | }; | 301 | }; |
| 302 | 302 | ||
| 303 | uart2_pins: uart2-pins { | 303 | uart2_pins: uart2-pins { |