Skip to content

Commit bc01606

Browse files
mripardmripard
committed
ARM: dts: sun5i: Remove underscores from nodes names
Some GPIO pinctrl nodes cannot be easily removed, because they would also change the pin configuration, for example to add a pull resistor or change the current delivered by the pin. Those nodes still have underscores and unit-addresses in their node names in our DTs, so adjust their name to remove the warnings. Use that occasion to also fix some poorly chosen node-names. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
1 parent 335d7fc commit bc01606

11 files changed

+20
-21
lines changed

‎arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
};
107107

108108
&pio {
109-
led_pins_t003: led_pins@0 {
109+
led_pins_t003: led-pin {
110110
pins = "PB2";
111111
function = "gpio_out";
112112
drive-strength = <20>;

‎arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@
125125
};
126126

127127
&pio {
128-
usb0_id_detect_pin: usb0_id_detect_pin@0 {
128+
usb0_id_detect_pin: usb0-id-detect-pin {
129129
pins = "PG12";
130130
function = "gpio_in";
131131
bias-pull-up;
132132
};
133133

134-
led_pins_t004: led_pins@0 {
134+
led_pins_t004: led-pin {
135135
pins = "PB2";
136136
function = "gpio_out";
137137
drive-strength = <20>;

‎arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,13 @@
223223
};
224224

225225
&pio {
226-
led_pins_olinuxino: led_pins@0 {
226+
led_pins_olinuxino: led-pin {
227227
pins = "PE3";
228228
function = "gpio_out";
229229
drive-strength = <20>;
230230
};
231231

232-
usb0_id_detect_pin: usb0_id_detect_pin@0 {
232+
usb0_id_detect_pin: usb0-id-detect-pin {
233233
pins = "PG12";
234234
function = "gpio_in";
235235
bias-pull-up;

‎arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
};
9999

100100
&pio {
101-
led_pins_r7: led_pins@0 {
101+
led_pins_r7: led-pin {
102102
pins = "PB2";
103103
function = "gpio_out";
104104
drive-strength = <20>;

‎arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@
134134
};
135135

136136
&pio {
137-
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
137+
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
138138
pins = "PG1";
139139
function = "gpio_in";
140140
bias-pull-down;
141141
};
142142

143-
usb0_id_detect_pin: usb0_id_detect_pin@0 {
143+
usb0_id_detect_pin: usb0-id-detect-pin {
144144
pins = "PG2";
145145
function = "gpio_in";
146146
bias-pull-up;

‎arch/arm/boot/dts/sun5i-a13-hsg-h702.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
};
134134

135135
&pio {
136-
usb0_id_detect_pin: usb0_id_detect_pin@0 {
136+
usb0_id_detect_pin: usb0-id-detect-pin {
137137
pins = "PG2";
138138
function = "gpio_in";
139139
bias-pull-up;

‎arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,19 @@
112112
};
113113

114114
&pio {
115-
led_pins_olinuxinom: led_pins@0 {
115+
led_pins_olinuxinom: led-pin {
116116
pins = "PG9";
117117
function = "gpio_out";
118118
drive-strength = <20>;
119119
};
120120

121-
usb0_id_detect_pin: usb0_id_detect_pin@0 {
121+
usb0_id_detect_pin: usb0-id-detect-pin {
122122
pins = "PG2";
123123
function = "gpio_in";
124124
bias-pull-up;
125125
};
126126

127-
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
127+
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
128128
pins = "PG1";
129129
function = "gpio_in";
130130
bias-pull-down;

‎arch/arm/boot/dts/sun5i-a13-olinuxino.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,19 @@
207207
};
208208

209209
&pio {
210-
led_pins_olinuxino: led_pins@0 {
210+
led_pins_olinuxino: led-pin {
211211
pins = "PG9";
212212
function = "gpio_out";
213213
drive-strength = <20>;
214214
};
215215

216-
usb0_id_detect_pin: usb0_id_detect_pin@0 {
216+
usb0_id_detect_pin: usb0-id-detect-pin {
217217
pins = "PG2";
218218
function = "gpio_in";
219219
bias-pull-up;
220220
};
221221

222-
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
222+
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
223223
pins = "PG1";
224224
function = "gpio_in";
225225
bias-pull-down;

‎arch/arm/boot/dts/sun5i-a13-utoo-p66.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
/delete-property/stdout-path;
5959
};
6060

61-
i2c_lcd: i2c@0 {
61+
i2c_lcd: i2c-gpio {
6262
/* The lcd panel i2c interface is hooked up via gpios */
6363
compatible = "i2c-gpio";
6464
pinctrl-names = "default";
@@ -95,7 +95,7 @@
9595
};
9696

9797
&pio {
98-
i2c_lcd_pins: i2c_lcd_pin@0 {
98+
i2c_lcd_pins: i2c-lcd-pin {
9999
pins = "PG10", "PG12";
100100
function = "gpio_out";
101101
bias-pull-up;

‎arch/arm/boot/dts/sun5i-r8-chip.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@
182182
};
183183

184184
&pio {
185-
186-
chip_w1_pin: chip_w1_pin@0 {
185+
chip_w1_pin: chip-w1-pin {
187186
pins = "PD2";
188187
function = "gpio_in";
189188
bias-pull-up;

‎arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@
137137
};
138138

139139
&pio {
140-
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
140+
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
141141
pins = "PG1";
142142
function = "gpio_in";
143143
bias-pull-down;
144144
};
145145

146-
usb0_id_detect_pin: usb0_id_detect_pin@0 {
146+
usb0_id_detect_pin: usb0-id-detect-pin {
147147
pins = "PG2";
148148
function = "gpio_in";
149149
bias-pull-up;

0 commit comments

Comments
 (0)