Skip to content

Commit 085021c

Browse files
twoernermmind
authored andcommitted
arm64: dts: rockchip: rk3308-rock-pi-s gpio-line-names cleanup
Perform the following cleanups on a previous patch: - indent lines after "gpio-line-names" - fix D0-D8 -> D0-D7 - sort phandle references Fixes: c45de75 ("arm64: dts: rockchip: add gpio-line-names to rk3308-rock-pi-s") Signed-off-by: Trevor Woerner <twoerner@gmail.com> Link: https://lore.kernel.org/r/20231219173814.1569-1-twoerner@gmail.com Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent 791c154 commit 085021c

1 file changed

Lines changed: 62 additions & 58 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts

Lines changed: 62 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,68 @@
143143
status = "okay";
144144
};
145145

146+
&gpio0 {
147+
gpio-line-names =
148+
/* GPIO0_A0 - A7 */
149+
"", "", "", "", "", "", "", "",
150+
/* GPIO0_B0 - B7 */
151+
"", "", "", "header1-pin3 [GPIO0_B3]",
152+
"header1-pin5 [GPIO0_B4]", "", "",
153+
"header1-pin11 [GPIO0_B7]",
154+
/* GPIO0_C0 - C7 */
155+
"header1-pin13 [GPIO0_C0]",
156+
"header1-pin15 [GPIO0_C1]", "", "", "",
157+
"", "", "",
158+
/* GPIO0_D0 - D7 */
159+
"", "", "", "", "", "", "", "";
160+
};
161+
162+
&gpio1 {
163+
gpio-line-names =
164+
/* GPIO1_A0 - A7 */
165+
"", "", "", "", "", "", "", "",
166+
/* GPIO1_B0 - B7 */
167+
"", "", "", "", "", "", "", "",
168+
/* GPIO1_C0 - C7 */
169+
"", "", "", "", "", "", "header1-pin21 [GPIO1_C6]",
170+
"header1-pin19 [GPIO1_C7]",
171+
/* GPIO1_D0 - D7 */
172+
"header1-pin23 [GPIO1_D0]", "header1-pin24 [GPIO1_D1]",
173+
"", "", "", "", "", "";
174+
};
175+
176+
&gpio2 {
177+
gpio-line-names =
178+
/* GPIO2_A0 - A7 */
179+
"header1-pin10 [GPIO2_A0]", "header1-pin8 [GPIO2_A1]",
180+
"", "",
181+
"header1-pin7 [GPIO2_A4]", "header1-pin12 [GPIO2_A5]",
182+
"header2-pin46 [GPIO2_A6]", "header1-pin22 [GPIO1_A7]",
183+
/* GPIO2_B0 - B7 */
184+
"header2-pin45 [GPIO2_B0]", "header1-pin18 [GPIO2_B1]",
185+
"header1-pin16 [GPIO2_B2]", "header2-pin44 [GPIO2_B3]",
186+
"header2-pin43 [GPIO2_B4]", "header2-pin28 [GPIO2_B5]",
187+
"header2-pin30 [GPIO2_B6]", "header2-pin32 [GPIO2_B7]",
188+
/* GPIO2_C0 - C7 */
189+
"header2-pin34 [GPIO2_C0]", "", "", "", "", "", "", "",
190+
/* GPIO2_D0 - D7 */
191+
"", "", "", "", "", "", "", "";
192+
};
193+
194+
&gpio3 {
195+
gpio-line-names =
196+
/* GPIO3_A0 - A7 */
197+
"", "", "", "", "", "", "", "",
198+
/* GPIO3_B0 - B7 */
199+
"", "", "header2-pin42 [GPIO3_B2]",
200+
"header2-pin41 [GPIO3_B3]", "header2-pin40 [GPIO3_B4]",
201+
"header2-pin39 [GPIO3_B5]", "", "",
202+
/* GPIO3_C0 - C7 */
203+
"", "", "", "", "", "", "", "",
204+
/* GPIO3_D0 - D7 */
205+
"", "", "", "", "", "", "", "";
206+
};
207+
146208
&i2c1 {
147209
status = "okay";
148210
};
@@ -250,61 +312,3 @@
250312
&wdt {
251313
status = "okay";
252314
};
253-
254-
&gpio0 {
255-
gpio-line-names =
256-
/* GPIO0_A0 - A7 */
257-
"", "", "", "", "", "", "", "",
258-
/* GPIO0_B0 - B7 */
259-
"", "", "", "header1-pin3 [GPIO0_B3]", "header1-pin5 [GPIO0_B4]",
260-
"", "", "header1-pin11 [GPIO0_B7]",
261-
/* GPIO0_C0 - C7 */
262-
"header1-pin13 [GPIO0_C0]", "header1-pin15 [GPIO0_C1]", "", "", "",
263-
"", "", "",
264-
/* GPIO0_D0 - D8 */
265-
"", "", "", "", "", "", "", "";
266-
};
267-
268-
&gpio1 {
269-
gpio-line-names =
270-
/* GPIO1_A0 - A7 */
271-
"", "", "", "", "", "", "", "",
272-
/* GPIO1_B0 - B7 */
273-
"", "", "", "", "", "", "", "",
274-
/* GPIO1_C0 - C7 */
275-
"", "", "", "", "", "", "header1-pin21 [GPIO1_C6]",
276-
"header1-pin19 [GPIO1_C7]",
277-
/* GPIO1_D0 - D8 */
278-
"header1-pin23 [GPIO1_D0]", "header1-pin24 [GPIO1_D1]", "", "", "",
279-
"", "", "";
280-
};
281-
282-
&gpio2 {
283-
gpio-line-names =
284-
/* GPIO2_A0 - A7 */
285-
"header1-pin10 [GPIO2_A0]", "header1-pin8 [GPIO2_A1]", "", "",
286-
"header1-pin7 [GPIO2_A4]", "header1-pin12 [GPIO2_A5]",
287-
"header2-pin46 [GPIO2_A6]", "header1-pin22 [GPIO1_A7]",
288-
/* GPIO2_B0 - B7 */
289-
"header2-pin45 [GPIO2_B0]", "header1-pin18 [GPIO2_B1]",
290-
"header1-pin16 [GPIO2_B2]", "header2-pin44 [GPIO2_B3]",
291-
"header2-pin43 [GPIO2_B4]", "header2-pin28 [GPIO2_B5]",
292-
"header2-pin30 [GPIO2_B6]", "header2-pin32 [GPIO2_B7]",
293-
/* GPIO2_C0 - C7 */
294-
"header2-pin34 [GPIO2_C0]", "", "", "", "", "", "", "",
295-
/* GPIO2_D0 - D8 */
296-
"", "", "", "", "", "", "", "";
297-
};
298-
299-
&gpio3 {
300-
gpio-line-names =
301-
/* GPIO3_A0 - A7 */
302-
"", "", "", "", "", "", "", "",
303-
/* GPIO3_B0 - B7 */
304-
"", "", "header2-pin42 [GPIO3_B2]", "header2-pin41 [GPIO3_B3]",
305-
"header2-pin40 [GPIO3_B4]", "header2-pin39 [GPIO3_B5]", "", "",
306-
/* GPIO3_C0 - C7 */
307-
"", "", "", "", "", "", "", "",
308-
/* GPIO3_D0 - D8 */
309-
"", "", "", "", "", "", "", "";
310-
};

0 commit comments

Comments
 (0)