diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-04-30 08:56:32 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-05-04 20:51:33 -0400 |
commit | a9483969815e90d6a5e25c7c941bb3d8d152f2bd (patch) | |
tree | 17aa546832d4a966a81edd9c6b903b83b20bbe2a /arch/arm | |
parent | e37e01112a4732406521116993aab9dbec8d7372 (diff) |
ARM: dts: kirkwood: rename pin-controller nodes
To prepare pin-controller consolidation, first rename all pinctrl nodes
to a more appropriate name regarding ePAPR recommended names.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-6-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
38 files changed, 38 insertions, 38 deletions
diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi index 294a6fa0208c..4f1eef36a7ac 100644 --- a/arch/arm/boot/dts/kirkwood-6192.dtsi +++ b/arch/arm/boot/dts/kirkwood-6192.dtsi | |||
@@ -35,7 +35,7 @@ | |||
35 | }; | 35 | }; |
36 | 36 | ||
37 | ocp@f1000000 { | 37 | ocp@f1000000 { |
38 | pinctrl: pinctrl@10000 { | 38 | pinctrl: pin-controller@10000 { |
39 | compatible = "marvell,88f6192-pinctrl"; | 39 | compatible = "marvell,88f6192-pinctrl"; |
40 | reg = <0x10000 0x20>; | 40 | reg = <0x10000 0x20>; |
41 | 41 | ||
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi index 2560cbbdb0b3..d95a7a9cfd1e 100644 --- a/arch/arm/boot/dts/kirkwood-6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi | |||
@@ -35,7 +35,7 @@ | |||
35 | }; | 35 | }; |
36 | 36 | ||
37 | ocp@f1000000 { | 37 | ocp@f1000000 { |
38 | pinctrl: pinctrl@10000 { | 38 | pinctrl: pin-controller@10000 { |
39 | compatible = "marvell,88f6281-pinctrl"; | 39 | compatible = "marvell,88f6281-pinctrl"; |
40 | reg = <0x10000 0x20>; | 40 | reg = <0x10000 0x20>; |
41 | 41 | ||
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi index f4b4786b9a01..523d6feeaf19 100644 --- a/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi | |||
@@ -56,7 +56,7 @@ | |||
56 | }; | 56 | }; |
57 | ocp@f1000000 { | 57 | ocp@f1000000 { |
58 | 58 | ||
59 | pinctrl: pinctrl@10000 { | 59 | pinctrl: pin-controller@10000 { |
60 | compatible = "marvell,88f6282-pinctrl"; | 60 | compatible = "marvell,88f6282-pinctrl"; |
61 | reg = <0x10000 0x20>; | 61 | reg = <0x10000 0x20>; |
62 | 62 | ||
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi index 3271e4c8ea07..c59e7b75b169 100644 --- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi | |||
@@ -1,6 +1,6 @@ | |||
1 | / { | 1 | / { |
2 | ocp@f1000000 { | 2 | ocp@f1000000 { |
3 | pinctrl: pinctrl@10000 { | 3 | pinctrl: pin-controller@10000 { |
4 | compatible = "marvell,98dx4122-pinctrl"; | 4 | compatible = "marvell,98dx4122-pinctrl"; |
5 | reg = <0x10000 0x20>; | 5 | reg = <0x10000 0x20>; |
6 | 6 | ||
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts index 86073f4f31ac..c723ce7ad1b8 100644 --- a/arch/arm/boot/dts/kirkwood-b3.dts +++ b/arch/arm/boot/dts/kirkwood-b3.dts | |||
@@ -45,7 +45,7 @@ | |||
45 | }; | 45 | }; |
46 | 46 | ||
47 | ocp@f1000000 { | 47 | ocp@f1000000 { |
48 | pinctrl: pinctrl@10000 { | 48 | pinctrl: pin-controller@10000 { |
49 | pmx_button_power: pmx-button-power { | 49 | pmx_button_power: pmx-button-power { |
50 | marvell,pins = "mpp39"; | 50 | marvell,pins = "mpp39"; |
51 | marvell,function = "gpio"; | 51 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts index 65ae6471d553..3f30475fea11 100644 --- a/arch/arm/boot/dts/kirkwood-cloudbox.dts +++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | pmx_cloudbox_sata0: pmx-cloudbox-sata0 { | 22 | pmx_cloudbox_sata0: pmx-cloudbox-sata0 { |
23 | marvell,pins = "mpp15"; | 23 | marvell,pins = "mpp15"; |
24 | marvell,function = "sata0"; | 24 | marvell,function = "sata0"; |
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi index 68dfb3ad57dd..9b62f78b516b 100644 --- a/arch/arm/boot/dts/kirkwood-db.dtsi +++ b/arch/arm/boot/dts/kirkwood-db.dtsi | |||
@@ -26,7 +26,7 @@ | |||
26 | }; | 26 | }; |
27 | 27 | ||
28 | ocp@f1000000 { | 28 | ocp@f1000000 { |
29 | pinctrl@10000 { | 29 | pin-controller@10000 { |
30 | pmx_sdio_gpios: pmx-sdio-gpios { | 30 | pmx_sdio_gpios: pmx-sdio-gpios { |
31 | marvell,pins = "mpp37", "mpp38"; | 31 | marvell,pins = "mpp37", "mpp38"; |
32 | marvell,function = "gpio"; | 32 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi index d5aa9564a287..bcc6e0f48571 100644 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi | |||
@@ -50,7 +50,7 @@ | |||
50 | }; | 50 | }; |
51 | 51 | ||
52 | ocp@f1000000 { | 52 | ocp@f1000000 { |
53 | pinctrl: pinctrl@10000 { | 53 | pinctrl: pin-controller@10000 { |
54 | 54 | ||
55 | pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0 | 55 | pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0 |
56 | &pmx_present_sata1 &pmx_fan_tacho | 56 | &pmx_present_sata1 &pmx_fan_tacho |
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts index d703f3eeef1c..849736349511 100644 --- a/arch/arm/boot/dts/kirkwood-dockstar.dts +++ b/arch/arm/boot/dts/kirkwood-dockstar.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | pmx_usb_power_enable: pmx-usb-power-enable { | 22 | pmx_usb_power_enable: pmx-usb-power-enable { |
23 | marvell,pins = "mpp29"; | 23 | marvell,pins = "mpp29"; |
24 | marvell,function = "gpio"; | 24 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index 8ed737e9aa2f..dd8d1a4611a8 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | pmx_led_bluetooth: pmx-led-bluetooth { | 22 | pmx_led_bluetooth: pmx-led-bluetooth { |
23 | marvell,pins = "mpp47"; | 23 | marvell,pins = "mpp47"; |
24 | marvell,function = "gpio"; | 24 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts index 5e39cc3ca95e..aa60a0b049a7 100644 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | pmx_usb_power_enable: pmx-usb-power-enable { | 22 | pmx_usb_power_enable: pmx-usb-power-enable { |
23 | marvell,pins = "mpp29"; | 23 | marvell,pins = "mpp29"; |
24 | marvell,function = "gpio"; | 24 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts index 3994a86f989e..871a5f8afb01 100644 --- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts +++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | pmx_led_health_r: pmx-led-health-r { | 22 | pmx_led_health_r: pmx-led-health-r { |
23 | marvell,pins = "mpp46"; | 23 | marvell,pins = "mpp46"; |
24 | marvell,function = "gpio"; | 24 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index 810818b2bff6..6804638eb87e 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | pmx_led_os_red: pmx-led-os-red { | 22 | pmx_led_os_red: pmx-led-os-red { |
23 | marvell,pins = "mpp22"; | 23 | marvell,pins = "mpp22"; |
24 | marvell,function = "gpio"; | 24 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index 7c4cd7e7535b..38e31d15a62d 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts | |||
@@ -30,7 +30,7 @@ | |||
30 | }; | 30 | }; |
31 | 31 | ||
32 | ocp@f1000000 { | 32 | ocp@f1000000 { |
33 | pinctrl: pinctrl@10000 { | 33 | pinctrl: pin-controller@10000 { |
34 | pmx_button_reset: pmx-button-reset { | 34 | pmx_button_reset: pmx-button-reset { |
35 | marvell,pins = "mpp12"; | 35 | marvell,pins = "mpp12"; |
36 | marvell,function = "gpio"; | 36 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts index 9a8d40a17938..05291f3990d0 100644 --- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | pinctrl-0 = < &pmx_led_sata_brt_ctrl_1 | 22 | pinctrl-0 = < &pmx_led_sata_brt_ctrl_1 |
23 | &pmx_led_sata_brt_ctrl_2 | 23 | &pmx_led_sata_brt_ctrl_2 |
24 | &pmx_led_backup_brt_ctrl_1 | 24 | &pmx_led_backup_brt_ctrl_1 |
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts index 2213a20e7871..db14bd03b86b 100644 --- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts +++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >; | 22 | pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >; |
23 | pinctrl-names = "default"; | 23 | pinctrl-names = "default"; |
24 | 24 | ||
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts index 6e83b13fc26a..4f7741184f98 100644 --- a/arch/arm/boot/dts/kirkwood-laplug.dts +++ b/arch/arm/boot/dts/kirkwood-laplug.dts | |||
@@ -55,7 +55,7 @@ | |||
55 | }; | 55 | }; |
56 | }; | 56 | }; |
57 | 57 | ||
58 | pinctrl: pinctrl@10000 { | 58 | pinctrl: pin-controller@10000 { |
59 | pmx_usb_power_enable: pmx-usb-power-enable { | 59 | pmx_usb_power_enable: pmx-usb-power-enable { |
60 | marvell,pins = "mpp14"; | 60 | marvell,pins = "mpp14"; |
61 | marvell,function = "gpio"; | 61 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index ed3cdfbb45bb..53484474df1f 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | }; | 8 | }; |
9 | 9 | ||
10 | ocp@f1000000 { | 10 | ocp@f1000000 { |
11 | pinctrl: pinctrl@10000 { | 11 | pinctrl: pin-controller@10000 { |
12 | pmx_power_hdd: pmx-power-hdd { | 12 | pmx_power_hdd: pmx-power-hdd { |
13 | marvell,pins = "mpp10"; | 13 | marvell,pins = "mpp10"; |
14 | marvell,function = "gpo"; | 14 | marvell,function = "gpo"; |
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts index b23abfe08d2f..414024c578e8 100644 --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts | |||
@@ -28,7 +28,7 @@ | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | ocp@f1000000 { | 30 | ocp@f1000000 { |
31 | pinctrl: pinctrl@10000 { | 31 | pinctrl: pin-controller@10000 { |
32 | pmx_led_health: pmx-led-health { | 32 | pmx_led_health: pmx-led-health { |
33 | marvell,pins = "mpp7"; | 33 | marvell,pins = "mpp7"; |
34 | marvell,function = "gpo"; | 34 | marvell,function = "gpo"; |
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts index dee94021c8ae..2f6c9988ed7d 100644 --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | |||
@@ -32,7 +32,7 @@ | |||
32 | }; | 32 | }; |
33 | 33 | ||
34 | ocp@f1000000 { | 34 | ocp@f1000000 { |
35 | pinctrl@10000 { | 35 | pin-controller@10000 { |
36 | pmx_usb_led: pmx-usb-led { | 36 | pmx_usb_led: pmx-usb-led { |
37 | marvell,pins = "mpp12"; | 37 | marvell,pins = "mpp12"; |
38 | marvell,function = "gpo"; | 38 | marvell,function = "gpo"; |
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts index b29cab304fd0..c4741699605c 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | |||
@@ -39,7 +39,7 @@ | |||
39 | }; | 39 | }; |
40 | 40 | ||
41 | ocp@f1000000 { | 41 | ocp@f1000000 { |
42 | pinctrl: pinctrl@10000 { | 42 | pinctrl: pin-controller@10000 { |
43 | pmx_button_power: pmx-button-power { | 43 | pmx_button_power: pmx-button-power { |
44 | marvell,pins = "mpp47"; | 44 | marvell,pins = "mpp47"; |
45 | marvell,function = "gpio"; | 45 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts index 4ef494231b78..8437f3e3b8d7 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | |||
@@ -41,7 +41,7 @@ | |||
41 | }; | 41 | }; |
42 | 42 | ||
43 | ocp@f1000000 { | 43 | ocp@f1000000 { |
44 | pinctrl: pinctrl@10000 { | 44 | pinctrl: pin-controller@10000 { |
45 | pmx_button_power: pmx-button-power { | 45 | pmx_button_power: pmx-button-power { |
46 | marvell,pins = "mpp47"; | 46 | marvell,pins = "mpp47"; |
47 | marvell,function = "gpio"; | 47 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi index da8891bbeec8..46eb8f6b6243 100644 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | }; | 8 | }; |
9 | 9 | ||
10 | ocp@f1000000 { | 10 | ocp@f1000000 { |
11 | pinctrl: pinctrl@10000 { | 11 | pinctrl: pin-controller@10000 { |
12 | pmx_ns2_sata0: pmx-ns2-sata0 { | 12 | pmx_ns2_sata0: pmx-ns2-sata0 { |
13 | marvell,pins = "mpp21"; | 13 | marvell,pins = "mpp21"; |
14 | marvell,function = "sata0"; | 14 | marvell,function = "sata0"; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index cd68210b9f11..78bdf9c7f16b 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts | |||
@@ -26,7 +26,7 @@ | |||
26 | }; | 26 | }; |
27 | 27 | ||
28 | ocp@f1000000 { | 28 | ocp@f1000000 { |
29 | pinctrl: pinctrl@10000 { | 29 | pinctrl: pin-controller@10000 { |
30 | pinctrl-0 = <&pmx_unknown>; | 30 | pinctrl-0 = <&pmx_unknown>; |
31 | pinctrl-names = "default"; | 31 | pinctrl-names = "default"; |
32 | 32 | ||
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index 8fd72d49e43f..0788473f0447 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts | |||
@@ -21,7 +21,7 @@ | |||
21 | }; | 21 | }; |
22 | 22 | ||
23 | ocp@f1000000 { | 23 | ocp@f1000000 { |
24 | pinctrl: pinctrl@10000 { | 24 | pinctrl: pin-controller@10000 { |
25 | pinctrl-names = "default"; | 25 | pinctrl-names = "default"; |
26 | 26 | ||
27 | pmx_led_esata_green: pmx-led-esata-green { | 27 | pmx_led_esata_green: pmx-led-esata-green { |
diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts index 817eaf02a346..24f686d1044d 100644 --- a/arch/arm/boot/dts/kirkwood-nsa320.dts +++ b/arch/arm/boot/dts/kirkwood-nsa320.dts | |||
@@ -38,7 +38,7 @@ | |||
38 | }; | 38 | }; |
39 | 39 | ||
40 | ocp@f1000000 { | 40 | ocp@f1000000 { |
41 | pinctrl: pinctrl@10000 { | 41 | pinctrl: pin-controller@10000 { |
42 | pinctrl-names = "default"; | 42 | pinctrl-names = "default"; |
43 | 43 | ||
44 | /* SATA Activity and Present pins are not connected */ | 44 | /* SATA Activity and Present pins are not connected */ |
diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi index 843b8b561e5e..9cb083b72404 100644 --- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | |||
@@ -5,7 +5,7 @@ | |||
5 | model = "ZyXEL NSA310"; | 5 | model = "ZyXEL NSA310"; |
6 | 6 | ||
7 | ocp@f1000000 { | 7 | ocp@f1000000 { |
8 | pinctrl: pinctrl@10000 { | 8 | pinctrl: pin-controller@10000 { |
9 | 9 | ||
10 | pmx_usb_power: pmx-usb-power { | 10 | pmx_usb_power: pmx-usb-power { |
11 | marvell,pins = "mpp21"; | 11 | marvell,pins = "mpp21"; |
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index 557b824f9c43..fd1c8b535e28 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts | |||
@@ -46,7 +46,7 @@ | |||
46 | }; | 46 | }; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | pinctrl: pinctrl@10000 { | 49 | pinctrl: pin-controller@10000 { |
50 | pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>; | 50 | pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>; |
51 | pinctrl-names = "default"; | 51 | pinctrl-names = "default"; |
52 | 52 | ||
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts index b1f5e1180803..8c3d50c57fa0 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts | |||
@@ -58,7 +58,7 @@ | |||
58 | }; | 58 | }; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | pinctrl: pinctrl@10000 { | 61 | pinctrl: pin-controller@10000 { |
62 | pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>; | 62 | pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>; |
63 | pinctrl-names = "default"; | 63 | pinctrl-names = "default"; |
64 | 64 | ||
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts index 8df800757175..30087b19efae 100644 --- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts +++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts | |||
@@ -40,7 +40,7 @@ | |||
40 | }; | 40 | }; |
41 | 41 | ||
42 | ocp@f1000000 { | 42 | ocp@f1000000 { |
43 | pinctrl: pinctrl@10000 { | 43 | pinctrl: pin-controller@10000 { |
44 | pinctrl-0 = <&pmx_usb_power>; | 44 | pinctrl-0 = <&pmx_usb_power>; |
45 | pinctrl-names = "default"; | 45 | pinctrl-names = "default"; |
46 | 46 | ||
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi index c573c204dbdb..26cf0e0ccefd 100644 --- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | |||
@@ -36,7 +36,7 @@ | |||
36 | }; | 36 | }; |
37 | 37 | ||
38 | ocp@f1000000 { | 38 | ocp@f1000000 { |
39 | pinctrl: pinctrl@10000 { | 39 | pinctrl: pin-controller@10000 { |
40 | pinctrl-0 = <&pmx_sdio_cd>; | 40 | pinctrl-0 = <&pmx_sdio_cd>; |
41 | pinctrl-names = "default"; | 41 | pinctrl-names = "default"; |
42 | 42 | ||
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi index bd01d306a754..a015af4da9a2 100644 --- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | |||
@@ -21,7 +21,7 @@ | |||
21 | }; | 21 | }; |
22 | 22 | ||
23 | ocp@f1000000 { | 23 | ocp@f1000000 { |
24 | pinctrl: pinctrl@10000 { | 24 | pinctrl: pin-controller@10000 { |
25 | 25 | ||
26 | pmx_usb_power_enable: pmx-usb-power-enable { | 26 | pmx_usb_power_enable: pmx-usb-power-enable { |
27 | marvell,pins = "mpp29"; | 27 | marvell,pins = "mpp29"; |
diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi index 4227c974729d..e137bd4e26fd 100644 --- a/arch/arm/boot/dts/kirkwood-synology.dtsi +++ b/arch/arm/boot/dts/kirkwood-synology.dtsi | |||
@@ -25,7 +25,7 @@ | |||
25 | }; | 25 | }; |
26 | 26 | ||
27 | ocp@f1000000 { | 27 | ocp@f1000000 { |
28 | pinctrl: pinctrl@10000 { | 28 | pinctrl: pin-controller@10000 { |
29 | pmx_alarmled_12: pmx-alarmled-12 { | 29 | pmx_alarmled_12: pmx-alarmled-12 { |
30 | marvell,pins = "mpp12"; | 30 | marvell,pins = "mpp12"; |
31 | marvell,function = "gpio"; | 31 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts index df53176c9354..ae102abcab04 100644 --- a/arch/arm/boot/dts/kirkwood-t5325.dts +++ b/arch/arm/boot/dts/kirkwood-t5325.dts | |||
@@ -41,7 +41,7 @@ | |||
41 | }; | 41 | }; |
42 | 42 | ||
43 | ocp@f1000000 { | 43 | ocp@f1000000 { |
44 | pinctrl: pinctrl@10000 { | 44 | pinctrl: pin-controller@10000 { |
45 | pinctrl-0 = <&pmx_i2s &pmx_sysrst>; | 45 | pinctrl-0 = <&pmx_i2s &pmx_sysrst>; |
46 | pinctrl-names = "default"; | 46 | pinctrl-names = "default"; |
47 | 47 | ||
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts index a85025ef4c52..5bc57efbee99 100644 --- a/arch/arm/boot/dts/kirkwood-topkick.dts +++ b/arch/arm/boot/dts/kirkwood-topkick.dts | |||
@@ -18,7 +18,7 @@ | |||
18 | }; | 18 | }; |
19 | 19 | ||
20 | ocp@f1000000 { | 20 | ocp@f1000000 { |
21 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
22 | /* | 22 | /* |
23 | * Switch positions | 23 | * Switch positions |
24 | * | 24 | * |
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts index c17ae45e19be..9767d73f3857 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | / { | 7 | / { |
8 | ocp@f1000000 { | 8 | ocp@f1000000 { |
9 | pinctrl: pinctrl@10000 { | 9 | pinctrl: pin-controller@10000 { |
10 | 10 | ||
11 | pinctrl-0 = <&pmx_ram_size &pmx_board_id>; | 11 | pinctrl-0 = <&pmx_ram_size &pmx_board_id>; |
12 | pinctrl-names = "default"; | 12 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts index 0713d072758a..bfc1a32d4e42 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts | |||
@@ -16,7 +16,7 @@ | |||
16 | }; | 16 | }; |
17 | 17 | ||
18 | ocp@f1000000 { | 18 | ocp@f1000000 { |
19 | pinctrl: pinctrl@10000 { | 19 | pinctrl: pin-controller@10000 { |
20 | 20 | ||
21 | pinctrl-0 = <&pmx_ram_size &pmx_board_id>; | 21 | pinctrl-0 = <&pmx_ram_size &pmx_board_id>; |
22 | pinctrl-names = "default"; | 22 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/kirkwood-ts419.dtsi b/arch/arm/boot/dts/kirkwood-ts419.dtsi index 1a9c624c7a92..30ab93bfb1e4 100644 --- a/arch/arm/boot/dts/kirkwood-ts419.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts419.dtsi | |||
@@ -14,7 +14,7 @@ | |||
14 | compatible = "qnap,ts419", "marvell,kirkwood"; | 14 | compatible = "qnap,ts419", "marvell,kirkwood"; |
15 | 15 | ||
16 | ocp@f1000000 { | 16 | ocp@f1000000 { |
17 | pinctrl: pinctrl@10000 { | 17 | pinctrl: pin-controller@10000 { |
18 | pinctrl-names = "default"; | 18 | pinctrl-names = "default"; |
19 | 19 | ||
20 | pmx_USB_copy_button: pmx-USB-copy-button { | 20 | pmx_USB_copy_button: pmx-USB-copy-button { |