tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: sun7i: 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>

Maxime Ripard 0356f1ae 89dddc2c

+21 -21
+1 -1
arch/arm/boot/dts/sun7i-a20-bananapi.dts
··· 248 248 "IO-6", "IO-3", "IO-2", "IO-0", "", "", "", "", 249 249 "", "", "", "", "", "", "", ""; 250 250 251 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 251 + usb0_id_detect_pin: usb0-id-detect-pin { 252 252 pins = "PH4"; 253 253 function = "gpio_in"; 254 254 bias-pull-up;
+1 -1
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
··· 180 180 }; 181 181 182 182 &pio { 183 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 183 + usb0_id_detect_pin: usb0-id-detect-pin { 184 184 pins = "PH4"; 185 185 function = "gpio_in"; 186 186 bias-pull-up;
+1 -1
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
··· 129 129 }; 130 130 131 131 &pio { 132 - led_pins_itead_core: led_pins@0 { 132 + led_pins_itead_core: led-pins { 133 133 pins = "PH20","PH21"; 134 134 function = "gpio_out"; 135 135 drive-strength = <20>;
+1 -1
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
··· 236 236 }; 237 237 238 238 &pio { 239 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 239 + usb0_id_detect_pin: usb0-id-detect-pin { 240 240 pins = "PH4"; 241 241 function = "gpio_in"; 242 242 bias-pull-up;
+1 -1
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
··· 239 239 }; 240 240 241 241 &pio { 242 - led_pins_olimex_som_evb: led_pins@0 { 242 + led_pins_olimex_som_evb: led-pins { 243 243 pins = "PH2"; 244 244 function = "gpio_out"; 245 245 drive-strength = <20>;
+3 -3
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
··· 175 175 }; 176 176 177 177 &pio { 178 - led_pins_olinuxinolime: led_pins@0 { 178 + led_pins_olinuxinolime: led-pins { 179 179 pins = "PH2"; 180 180 function = "gpio_out"; 181 181 drive-strength = <20>; 182 182 }; 183 183 184 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 184 + usb0_id_detect_pin: usb0-id-detect-pin { 185 185 pins = "PH4"; 186 186 function = "gpio_in"; 187 187 bias-pull-up; 188 188 }; 189 189 190 - usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { 190 + usb0_vbus_detect_pin: usb0-vbus-detect-pin { 191 191 pins = "PH5"; 192 192 function = "gpio_in"; 193 193 bias-pull-down;
+3 -3
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
··· 180 180 }; 181 181 182 182 &pio { 183 - led_pins_olinuxinolime: led_pins@0 { 183 + led_pins_olinuxinolime: led-pins { 184 184 pins = "PH2"; 185 185 function = "gpio_out"; 186 186 drive-strength = <20>; 187 187 }; 188 188 189 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 189 + usb0_id_detect_pin: usb0-id-detect-pin { 190 190 pins = "PH4"; 191 191 function = "gpio_in"; 192 192 bias-pull-up; 193 193 }; 194 194 195 - usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { 195 + usb0_vbus_detect_pin: usb0-vbus-detect-pin { 196 196 pins = "PH5"; 197 197 function = "gpio_in"; 198 198 bias-pull-down;
+4 -4
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
··· 252 252 }; 253 253 254 254 &pio { 255 - gmac_txerr: gmac_txerr@0 { 255 + gmac_txerr: gmac-txerr-pin { 256 256 pins = "PA17"; 257 257 function = "gmac"; 258 258 }; 259 259 260 - led_pins_olinuxino: led_pins@0 { 260 + led_pins_olinuxino: led-pins { 261 261 pins = "PH2"; 262 262 function = "gpio_out"; 263 263 drive-strength = <20>; 264 264 }; 265 265 266 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 266 + usb0_id_detect_pin: usb0-id-detect-pin { 267 267 pins = "PH4"; 268 268 function = "gpio_in"; 269 269 bias-pull-up; 270 270 }; 271 271 272 - usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { 272 + usb0_vbus_detect_pin: usb0-vbus-detect-pin { 273 273 pins = "PH5"; 274 274 function = "gpio_in"; 275 275 bias-pull-down;
+1 -1
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
··· 183 183 }; 184 184 185 185 &pio { 186 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 186 + usb0_id_detect_pin: usb0-id-detect-pin { 187 187 pins = "PH4"; 188 188 function = "gpio_in"; 189 189 bias-pull-up;
+1 -1
arch/arm/boot/dts/sun7i-a20-orangepi.dts
··· 140 140 }; 141 141 142 142 &pio { 143 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 143 + usb0_id_detect_pin: usb0-id-detect-pin { 144 144 pins = "PH4"; 145 145 function = "gpio_in"; 146 146 bias-pull-up;
+1 -1
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
··· 173 173 }; 174 174 175 175 &pio { 176 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 176 + usb0_id_detect_pin: usb0-id-detect-pin { 177 177 pins = "PH4"; 178 178 function = "gpio_in"; 179 179 bias-pull-up;
+1 -1
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
··· 173 173 }; 174 174 175 175 &pio { 176 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 176 + usb0_id_detect_pin: usb0-id-detect-pin { 177 177 pins = "PH4"; 178 178 function = "gpio_in"; 179 179 bias-pull-up;
+1 -1
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
··· 165 165 }; 166 166 167 167 &pio { 168 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 168 + usb0_id_detect_pin: usb0-id-detect-pin { 169 169 pins = "PH4"; 170 170 function = "gpio_in"; 171 171 bias-pull-up;
+1 -1
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
··· 156 156 }; 157 157 158 158 &pio { 159 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 159 + usb0_id_detect_pin: usb0-id-detect-pin { 160 160 pins = "PH4"; 161 161 function = "gpio_in"; 162 162 bias-pull-up;