aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorArnaud Ebalard <arno@natisbad.org>2014-11-21 18:45:56 -0500
committerJason Cooper <jason@lakedaemon.net>2014-11-21 23:32:04 -0500
commit4904a82a9399d037588162e6fb4b293fa6a37f7c (patch)
tree4066822e180aa9ea41477d2401052ce9716cb260 /arch/arm/boot
parentf19d09e430a6a67d3a5c79e861bae97133caf521 (diff)
arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi
What was done by Sebastian in 264a05e19bf5 ("ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address") and 01c434225ee6 ("ARM: mvebu: armada-xp: Use pinctrl node alias") can also be done for Armada 370, i.e. - Rename Armada 370 pinctrl node to pin-ctrl with its address encoded - Add a node alias to access the pinctrl node easily. - use the newly available alias in existing Armada 370 .dts files We can even go a bit further by putting the pinctrl node definition in armada-370-xp.dtsi, with only its reg property defined. This allows us to then also use the newly defined node alias in armada-xp.dtsi, armada-370.dtsi. Suggested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Suggested-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Link: https://lkml.kernel.org/r/b54eb45e5242728aace3ce8aef2eae4251f8dea3.1416613429.git.arno@natisbad.org Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/armada-370-db.dts24
-rw-r--r--arch/arm/boot/dts/armada-370-mirabox.dts25
-rw-r--r--arch/arm/boot/dts/armada-370-netgear-rn102.dts84
-rw-r--r--arch/arm/boot/dts/armada-370-netgear-rn104.dts64
-rw-r--r--arch/arm/boot/dts/armada-370-rd.dts24
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi4
-rw-r--r--arch/arm/boot/dts/armada-370.dtsi121
-rw-r--r--arch/arm/boot/dts/armada-xp.dtsi72
8 files changed, 222 insertions, 196 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 0b7bf5ea7bd5..472b7434e80c 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -201,3 +201,27 @@
201 compatible = "linux,spdif-dir"; 201 compatible = "linux,spdif-dir";
202 }; 202 };
203}; 203};
204
205&pinctrl {
206 /*
207 * These pins might be muxed as I2S by
208 * the bootloader, but it conflicts
209 * with the real I2S pins that are
210 * muxed using i2s_pins. We must mux
211 * those pins to a function other than
212 * I2S.
213 */
214 pinctrl-0 = <&hog_pins1 &hog_pins2>;
215 pinctrl-names = "default";
216
217 hog_pins1: hog-pins1 {
218 marvell,pins = "mpp6", "mpp8", "mpp10",
219 "mpp12", "mpp13";
220 marvell,function = "gpio";
221 };
222
223 hog_pins2: hog-pins2 {
224 marvell,pins = "mpp5", "mpp7", "mpp9";
225 marvell,function = "gpo";
226 };
227};
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 2b6d24e0d1e8..e1b0eb6b091f 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -54,18 +54,6 @@
54 status = "okay"; 54 status = "okay";
55 }; 55 };
56 56
57 pinctrl {
58 pwr_led_pin: pwr-led-pin {
59 marvell,pins = "mpp63";
60 marvell,function = "gpo";
61 };
62
63 stat_led_pins: stat-led-pins {
64 marvell,pins = "mpp64", "mpp65";
65 marvell,function = "gpio";
66 };
67 };
68
69 gpio_leds { 57 gpio_leds {
70 compatible = "gpio-leds"; 58 compatible = "gpio-leds";
71 pinctrl-names = "default"; 59 pinctrl-names = "default";
@@ -169,3 +157,16 @@
169 }; 157 };
170 }; 158 };
171}; 159};
160
161&pinctrl {
162 pwr_led_pin: pwr-led-pin {
163 marvell,pins = "mpp63";
164 marvell,function = "gpo";
165 };
166
167 stat_led_pins: stat-led-pins {
168 marvell,pins = "mpp64", "mpp65";
169 marvell,function = "gpio";
170 };
171};
172
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index 1e38628f4060..4e24932c6e30 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -59,48 +59,6 @@
59 status = "okay"; 59 status = "okay";
60 }; 60 };
61 61
62 pinctrl {
63 power_led_pin: power-led-pin {
64 marvell,pins = "mpp57";
65 marvell,function = "gpio";
66 };
67
68 sata1_led_pin: sata1-led-pin {
69 marvell,pins = "mpp15";
70 marvell,function = "gpio";
71 };
72
73 sata2_led_pin: sata2-led-pin {
74 marvell,pins = "mpp14";
75 marvell,function = "gpio";
76 };
77
78 backup_led_pin: backup-led-pin {
79 marvell,pins = "mpp56";
80 marvell,function = "gpio";
81 };
82
83 backup_button_pin: backup-button-pin {
84 marvell,pins = "mpp58";
85 marvell,function = "gpio";
86 };
87
88 power_button_pin: power-button-pin {
89 marvell,pins = "mpp62";
90 marvell,function = "gpio";
91 };
92
93 reset_button_pin: reset-button-pin {
94 marvell,pins = "mpp6";
95 marvell,function = "gpio";
96 };
97
98 poweroff: poweroff {
99 marvell,pins = "mpp8";
100 marvell,function = "gpio";
101 };
102 };
103
104 mdio { 62 mdio {
105 pinctrl-0 = <&mdio_pins>; 63 pinctrl-0 = <&mdio_pins>;
106 pinctrl-names = "default"; 64 pinctrl-names = "default";
@@ -257,3 +215,45 @@
257 gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; 215 gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
258 }; 216 };
259}; 217};
218
219&pinctrl {
220 power_led_pin: power-led-pin {
221 marvell,pins = "mpp57";
222 marvell,function = "gpio";
223 };
224
225 sata1_led_pin: sata1-led-pin {
226 marvell,pins = "mpp15";
227 marvell,function = "gpio";
228 };
229
230 sata2_led_pin: sata2-led-pin {
231 marvell,pins = "mpp14";
232 marvell,function = "gpio";
233 };
234
235 backup_led_pin: backup-led-pin {
236 marvell,pins = "mpp56";
237 marvell,function = "gpio";
238 };
239
240 backup_button_pin: backup-button-pin {
241 marvell,pins = "mpp58";
242 marvell,function = "gpio";
243 };
244
245 power_button_pin: power-button-pin {
246 marvell,pins = "mpp62";
247 marvell,function = "gpio";
248 };
249
250 reset_button_pin: reset-button-pin {
251 marvell,pins = "mpp6";
252 marvell,function = "gpio";
253 };
254
255 poweroff: poweroff {
256 marvell,pins = "mpp8";
257 marvell,function = "gpio";
258 };
259};
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index c2f414bb9aba..30586e47986a 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -53,38 +53,6 @@
53 status = "okay"; 53 status = "okay";
54 }; 54 };
55 55
56 pinctrl {
57 poweroff: poweroff {
58 marvell,pins = "mpp60";
59 marvell,function = "gpio";
60 };
61
62 backup_button_pin: backup-button-pin {
63 marvell,pins = "mpp52";
64 marvell,function = "gpio";
65 };
66
67 power_button_pin: power-button-pin {
68 marvell,pins = "mpp62";
69 marvell,function = "gpio";
70 };
71
72 backup_led_pin: backup-led-pin {
73 marvell,pins = "mpp63";
74 marvell,function = "gpo";
75 };
76
77 power_led_pin: power-led-pin {
78 marvell,pins = "mpp64";
79 marvell,function = "gpio";
80 };
81
82 reset_button_pin: reset-button-pin {
83 marvell,pins = "mpp65";
84 marvell,function = "gpio";
85 };
86 };
87
88 mdio { 56 mdio {
89 pinctrl-0 = <&mdio_pins>; 57 pinctrl-0 = <&mdio_pins>;
90 pinctrl-names = "default"; 58 pinctrl-names = "default";
@@ -269,3 +237,35 @@
269 gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; 237 gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
270 }; 238 };
271}; 239};
240
241&pinctrl {
242 poweroff: poweroff {
243 marvell,pins = "mpp60";
244 marvell,function = "gpio";
245 };
246
247 backup_button_pin: backup-button-pin {
248 marvell,pins = "mpp52";
249 marvell,function = "gpio";
250 };
251
252 power_button_pin: power-button-pin {
253 marvell,pins = "mpp62";
254 marvell,function = "gpio";
255 };
256
257 backup_led_pin: backup-led-pin {
258 marvell,pins = "mpp63";
259 marvell,function = "gpo";
260 };
261
262 power_led_pin: power-led-pin {
263 marvell,pins = "mpp64";
264 marvell,function = "gpio";
265 };
266
267 reset_button_pin: reset-button-pin {
268 marvell,pins = "mpp65";
269 marvell,function = "gpio";
270 };
271};
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index 2bb671a778db..394308951ed9 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -59,18 +59,6 @@
59 }; 59 };
60 60
61 internal-regs { 61 internal-regs {
62 pinctrl {
63 fan_pins: fan-pins {
64 marvell,pins = "mpp8";
65 marvell,function = "gpio";
66 };
67
68 led_pins: led-pins {
69 marvell,pins = "mpp32";
70 marvell,function = "gpio";
71 };
72 };
73
74 serial@12000 { 62 serial@12000 {
75 status = "okay"; 63 status = "okay";
76 }; 64 };
@@ -213,3 +201,15 @@
213 }; 201 };
214 }; 202 };
215 }; 203 };
204
205&pinctrl {
206 fan_pins: fan-pins {
207 marvell,pins = "mpp8";
208 marvell,function = "gpio";
209 };
210
211 led_pins: led-pins {
212 marvell,pins = "mpp32";
213 marvell,function = "gpio";
214 };
215};
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 2057351ed00b..83c31c86dd09 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -171,6 +171,10 @@
171 status = "disabled"; 171 status = "disabled";
172 }; 172 };
173 173
174 pinctrl: pin-ctrl@18000 {
175 reg = <0x18000 0x38>;
176 };
177
174 coredivclk: corediv-clock@18740 { 178 coredivclk: corediv-clock@18740 {
175 compatible = "marvell,armada-370-corediv-clock"; 179 compatible = "marvell,armada-370-corediv-clock";
176 reg = <0x18740 0xc>; 180 reg = <0x18740 0xc>;
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 509928621ea7..ecf0bf153fec 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -107,67 +107,6 @@
107 reg = <0x11100 0x20>; 107 reg = <0x11100 0x20>;
108 }; 108 };
109 109
110 pinctrl {
111 compatible = "marvell,mv88f6710-pinctrl";
112 reg = <0x18000 0x38>;
113
114 sdio_pins1: sdio-pins1 {
115 marvell,pins = "mpp9", "mpp11", "mpp12",
116 "mpp13", "mpp14", "mpp15";
117 marvell,function = "sd0";
118 };
119
120 sdio_pins2: sdio-pins2 {
121 marvell,pins = "mpp47", "mpp48", "mpp49",
122 "mpp50", "mpp51", "mpp52";
123 marvell,function = "sd0";
124 };
125
126 sdio_pins3: sdio-pins3 {
127 marvell,pins = "mpp48", "mpp49", "mpp50",
128 "mpp51", "mpp52", "mpp53";
129 marvell,function = "sd0";
130 };
131
132 i2c0_pins: i2c0-pins {
133 marvell,pins = "mpp2", "mpp3";
134 marvell,function = "i2c0";
135 };
136
137 i2s_pins1: i2s-pins1 {
138 marvell,pins = "mpp5", "mpp6", "mpp7",
139 "mpp8", "mpp9", "mpp10",
140 "mpp12", "mpp13";
141 marvell,function = "audio";
142 };
143
144 i2s_pins2: i2s-pins2 {
145 marvell,pins = "mpp49", "mpp47", "mpp50",
146 "mpp59", "mpp57", "mpp61",
147 "mpp62", "mpp60", "mpp58";
148 marvell,function = "audio";
149 };
150
151 mdio_pins: mdio-pins {
152 marvell,pins = "mpp17", "mpp18";
153 marvell,function = "ge";
154 };
155
156 ge0_rgmii_pins: ge0-rgmii-pins {
157 marvell,pins = "mpp5", "mpp6", "mpp7", "mpp8",
158 "mpp9", "mpp10", "mpp11", "mpp12",
159 "mpp13", "mpp14", "mpp15", "mpp16";
160 marvell,function = "ge0";
161 };
162
163 ge1_rgmii_pins: ge1-rgmii-pins {
164 marvell,pins = "mpp19", "mpp20", "mpp21", "mpp22",
165 "mpp23", "mpp24", "mpp25", "mpp26",
166 "mpp27", "mpp28", "mpp29", "mpp30";
167 marvell,function = "ge1";
168 };
169 };
170
171 gpio0: gpio@18100 { 110 gpio0: gpio@18100 {
172 compatible = "marvell,orion-gpio"; 111 compatible = "marvell,orion-gpio";
173 reg = <0x18100 0x40>; 112 reg = <0x18100 0x40>;
@@ -307,3 +246,63 @@
307 }; 246 };
308 }; 247 };
309}; 248};
249
250&pinctrl {
251 compatible = "marvell,mv88f6710-pinctrl";
252
253 sdio_pins1: sdio-pins1 {
254 marvell,pins = "mpp9", "mpp11", "mpp12",
255 "mpp13", "mpp14", "mpp15";
256 marvell,function = "sd0";
257 };
258
259 sdio_pins2: sdio-pins2 {
260 marvell,pins = "mpp47", "mpp48", "mpp49",
261 "mpp50", "mpp51", "mpp52";
262 marvell,function = "sd0";
263 };
264
265 sdio_pins3: sdio-pins3 {
266 marvell,pins = "mpp48", "mpp49", "mpp50",
267 "mpp51", "mpp52", "mpp53";
268 marvell,function = "sd0";
269 };
270
271 i2c0_pins: i2c0-pins {
272 marvell,pins = "mpp2", "mpp3";
273 marvell,function = "i2c0";
274 };
275
276 i2s_pins1: i2s-pins1 {
277 marvell,pins = "mpp5", "mpp6", "mpp7",
278 "mpp8", "mpp9", "mpp10",
279 "mpp12", "mpp13";
280 marvell,function = "audio";
281 };
282
283 i2s_pins2: i2s-pins2 {
284 marvell,pins = "mpp49", "mpp47", "mpp50",
285 "mpp59", "mpp57", "mpp61",
286 "mpp62", "mpp60", "mpp58";
287 marvell,function = "audio";
288 };
289
290 mdio_pins: mdio-pins {
291 marvell,pins = "mpp17", "mpp18";
292 marvell,function = "ge";
293 };
294
295 ge0_rgmii_pins: ge0-rgmii-pins {
296 marvell,pins = "mpp5", "mpp6", "mpp7", "mpp8",
297 "mpp9", "mpp10", "mpp11", "mpp12",
298 "mpp13", "mpp14", "mpp15", "mpp16";
299 marvell,function = "ge0";
300 };
301
302 ge1_rgmii_pins: ge1-rgmii-pins {
303 marvell,pins = "mpp19", "mpp20", "mpp21", "mpp22",
304 "mpp23", "mpp24", "mpp25", "mpp26",
305 "mpp27", "mpp28", "mpp29", "mpp30";
306 marvell,function = "ge1";
307 };
308};
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index e4ba27ef109b..b59a83cf2f26 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -73,43 +73,6 @@
73 status = "disabled"; 73 status = "disabled";
74 }; 74 };
75 75
76 pinctrl: pin-ctrl@18000 {
77 reg = <0x18000 0x38>;
78
79 pmx_ge0_gmii: pmx-ge0-gmii {
80 marvell,pins =
81 "mpp0", "mpp1", "mpp2", "mpp3",
82 "mpp4", "mpp5", "mpp6", "mpp7",
83 "mpp8", "mpp9", "mpp10", "mpp11",
84 "mpp12", "mpp13", "mpp14", "mpp15",
85 "mpp16", "mpp17", "mpp18", "mpp19",
86 "mpp20", "mpp21", "mpp22", "mpp23";
87 marvell,function = "ge0";
88 };
89
90 pmx_ge0_rgmii: pmx-ge0-rgmii {
91 marvell,pins =
92 "mpp0", "mpp1", "mpp2", "mpp3",
93 "mpp4", "mpp5", "mpp6", "mpp7",
94 "mpp8", "mpp9", "mpp10", "mpp11";
95 marvell,function = "ge0";
96 };
97
98 pmx_ge1_rgmii: pmx-ge1-rgmii {
99 marvell,pins =
100 "mpp12", "mpp13", "mpp14", "mpp15",
101 "mpp16", "mpp17", "mpp18", "mpp19",
102 "mpp20", "mpp21", "mpp22", "mpp23";
103 marvell,function = "ge1";
104 };
105
106 sdio_pins: sdio-pins {
107 marvell,pins = "mpp30", "mpp31", "mpp32",
108 "mpp33", "mpp34", "mpp35";
109 marvell,function = "sd0";
110 };
111 };
112
113 system-controller@18200 { 76 system-controller@18200 {
114 compatible = "marvell,armada-370-xp-system-controller"; 77 compatible = "marvell,armada-370-xp-system-controller";
115 reg = <0x18200 0x500>; 78 reg = <0x18200 0x500>;
@@ -238,3 +201,38 @@
238 }; 201 };
239 }; 202 };
240}; 203};
204
205&pinctrl {
206 pmx_ge0_gmii: pmx-ge0-gmii {
207 marvell,pins =
208 "mpp0", "mpp1", "mpp2", "mpp3",
209 "mpp4", "mpp5", "mpp6", "mpp7",
210 "mpp8", "mpp9", "mpp10", "mpp11",
211 "mpp12", "mpp13", "mpp14", "mpp15",
212 "mpp16", "mpp17", "mpp18", "mpp19",
213 "mpp20", "mpp21", "mpp22", "mpp23";
214 marvell,function = "ge0";
215 };
216
217 pmx_ge0_rgmii: pmx-ge0-rgmii {
218 marvell,pins =
219 "mpp0", "mpp1", "mpp2", "mpp3",
220 "mpp4", "mpp5", "mpp6", "mpp7",
221 "mpp8", "mpp9", "mpp10", "mpp11";
222 marvell,function = "ge0";
223 };
224
225 pmx_ge1_rgmii: pmx-ge1-rgmii {
226 marvell,pins =
227 "mpp12", "mpp13", "mpp14", "mpp15",
228 "mpp16", "mpp17", "mpp18", "mpp19",
229 "mpp20", "mpp21", "mpp22", "mpp23";
230 marvell,function = "ge1";
231 };
232
233 sdio_pins: sdio-pins {
234 marvell,pins = "mpp30", "mpp31", "mpp32",
235 "mpp33", "mpp34", "mpp35";
236 marvell,function = "sd0";
237 };
238};
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-04 09:12:22 -0500