Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address

Browse Source 
In other MVEBU SoCs, the pin controller node is called pin-ctrl with
its base address added. Also, we have a node alias to access the pinctrl
node easily. Fix this for Armada XP pinctrl nodes to be consistent with
other SoCs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2014-09-19 21:12:00 +02:00 committed by Jason Cooper
parent b324fa60ac
commit 264a05e19b
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/armada-xp-axpwifiap.dts
View File

@ -60,7 +60,7 @@
}; };
internal-regs { internal-regs {
pinctrl { pinctrl: pin-ctrl@18000 {
pinctrl-0 = <&pmx_phy_int>; pinctrl-0 = <&pmx_phy_int>;
pinctrl-names = "default"; pinctrl-names = "default";

2
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
View File

@ -51,7 +51,7 @@
}; };
internal-regs { internal-regs {
pinctrl { pinctrl: pin-ctrl@18000 {
poweroff_pin: poweroff-pin { poweroff_pin: poweroff-pin {
marvell,pins = "mpp24"; marvell,pins = "mpp24";
marvell,function = "gpio"; marvell,function = "gpio";

2
arch/arm/boot/dts/armada-xp-mv78230.dtsi
View File

@ -167,7 +167,7 @@
}; };
internal-regs { internal-regs {
pinctrl { pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78230-pinctrl"; compatible = "marvell,mv78230-pinctrl";
}; };

2
arch/arm/boot/dts/armada-xp-mv78260.dtsi
View File

@ -251,7 +251,7 @@
}; };
internal-regs { internal-regs {
pinctrl { pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78260-pinctrl"; compatible = "marvell,mv78260-pinctrl";
}; };

2
arch/arm/boot/dts/armada-xp-mv78460.dtsi
View File

@ -289,7 +289,7 @@
}; };
internal-regs { internal-regs {
pinctrl { pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78460-pinctrl"; compatible = "marvell,mv78460-pinctrl";
}; };

2
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
View File

@ -55,7 +55,7 @@
}; };
internal-regs { internal-regs {
pinctrl { pinctrl: pin-ctrl@18000 {
poweroff: poweroff { poweroff: poweroff {
marvell,pins = "mpp42"; marvell,pins = "mpp42";
marvell,function = "gpio"; marvell,function = "gpio";

2
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
View File

@ -77,7 +77,7 @@
serial@12100 { serial@12100 {
status = "okay"; status = "okay";
}; };
pinctrl { pinctrl: pin-ctrl@18000 {
led_pins: led-pins-0 { led_pins: led-pins-0 {
marvell,pins = "mpp49", "mpp51", "mpp53"; marvell,pins = "mpp49", "mpp51", "mpp53";
marvell,function = "gpio"; marvell,function = "gpio";

2
arch/arm/boot/dts/armada-xp.dtsi
View File

@ -72,7 +72,7 @@
status = "disabled"; status = "disabled";
}; };
pinctrl { pinctrl: pin-ctrl@18000 {
reg = <0x18000 0x38>; reg = <0x18000 0x38>;
sdio_pins: sdio-pins { sdio_pins: sdio-pins {