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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlWDH68ACgkQCwYYjhRyO9VNqACeNs5tNkj4ecJPpTOsMZPV6b7e
 WVcAoKJ1DCIBEREi4whA2bRcUurmXce9
 =1Iem
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Kevin Hilman 2015-07-01 12:53:49 -07:00
Родитель 6540165cf4 8c19a731a1
Коммит b72802c311
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -297,7 +297,7 @@
spi0_pins: spi0-pins {
marvell,pins = "mpp36", "mpp37",
"mpp38", "mpp39";
marvell,function = "spi";
marvell,function = "spi0";
};
uart2_pins: uart2-pins {