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

ARM: dts: sunxi: Remove useless pinctrl nodes

We have for the H3 boards some kind of cargo cult apparently, where we
would have a pinctrl node even for GPIOs without any particular settings.

This is pretty much useless, so let's remove them.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

-131
-23
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
··· 59 59 60 60 leds { 61 61 compatible = "gpio-leds"; 62 - pinctrl-names = "default"; 63 - pinctrl-0 = <&leds_npi>, <&leds_r_npi>; 64 62 65 63 status { 66 64 label = "nanopi:blue:status"; ··· 76 78 r_gpio_keys { 77 79 compatible = "gpio-keys"; 78 80 input-name = "k1"; 79 - pinctrl-names = "default"; 80 - pinctrl-0 = <&sw_r_npi>; 81 81 82 82 k1 { 83 83 label = "k1"; ··· 98 102 99 103 &ohci3 { 100 104 status = "okay"; 101 - }; 102 - 103 - &pio { 104 - leds_npi: led_pins { 105 - pins = "PA10"; 106 - function = "gpio_out"; 107 - }; 108 - }; 109 - 110 - &r_pio { 111 - leds_r_npi: led_pins { 112 - pins = "PL10"; 113 - function = "gpio_out"; 114 - }; 115 - 116 - sw_r_npi: key_pins { 117 - pins = "PL3"; 118 - function = "gpio_in"; 119 - }; 120 105 }; 121 106 122 107 &uart0 {
-30
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
··· 75 75 76 76 leds { 77 77 compatible = "gpio-leds"; 78 - pinctrl-names = "default"; 79 - pinctrl-0 = <&leds_opc>, <&leds_r_opc>; 80 78 81 79 status_led { 82 80 label = "orangepi:red:status"; ··· 90 92 91 93 r_gpio_keys { 92 94 compatible = "gpio-keys"; 93 - pinctrl-names = "default"; 94 - pinctrl-0 = <&sw_r_opc>; 95 95 96 96 sw2 { 97 97 label = "sw2"; ··· 106 110 107 111 wifi_pwrseq: wifi_pwrseq { 108 112 compatible = "mmc-pwrseq-simple"; 109 - pinctrl-names = "default"; 110 - pinctrl-0 = <&wifi_pwrseq_pin_orangepi>; 111 113 reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 WIFI_EN */ 112 114 }; 113 115 }; ··· 170 176 */ 171 177 rtl8189: sdio_wifi@1 { 172 178 reg = <1>; 173 - }; 174 - }; 175 - 176 - &pio { 177 - leds_opc: led_pins { 178 - pins = "PA15"; 179 - function = "gpio_out"; 180 - }; 181 - }; 182 - 183 - &r_pio { 184 - leds_r_opc: led_pins { 185 - pins = "PL10"; 186 - function = "gpio_out"; 187 - }; 188 - 189 - sw_r_opc: key_pins { 190 - pins = "PL3", "PL4"; 191 - function = "gpio_in"; 192 - }; 193 - 194 - wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin { 195 - pins = "PL7"; 196 - function = "gpio_out"; 197 179 }; 198 180 }; 199 181
-23
arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
··· 74 74 75 75 leds { 76 76 compatible = "gpio-leds"; 77 - pinctrl-names = "default"; 78 - pinctrl-0 = <&leds_opc>, <&leds_r_opc>; 79 77 80 78 pwr_led { 81 79 label = "orangepi:green:pwr"; ··· 89 91 90 92 r_gpio_keys { 91 93 compatible = "gpio-keys"; 92 - pinctrl-names = "default"; 93 - pinctrl-0 = <&sw_r_opc>; 94 94 95 95 sw4 { 96 96 label = "sw4"; ··· 154 158 155 159 &ohci2 { 156 160 status = "okay"; 157 - }; 158 - 159 - &pio { 160 - leds_opc: led_pins { 161 - pins = "PA15"; 162 - function = "gpio_out"; 163 - }; 164 - }; 165 - 166 - &r_pio { 167 - leds_r_opc: led_pins { 168 - pins = "PL10"; 169 - function = "gpio_out"; 170 - }; 171 - 172 - sw_r_opc: key_pins { 173 - pins = "PL3"; 174 - function = "gpio_in"; 175 - }; 176 161 }; 177 162 178 163 &uart0 {
-23
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
··· 73 73 74 74 leds { 75 75 compatible = "gpio-leds"; 76 - pinctrl-names = "default"; 77 - pinctrl-0 = <&leds_opc>, <&leds_r_opc>; 78 76 79 77 pwr_led { 80 78 label = "orangepi:green:pwr"; ··· 88 90 89 91 r_gpio_keys { 90 92 compatible = "gpio-keys"; 91 - pinctrl-names = "default"; 92 - pinctrl-0 = <&sw_r_opc>; 93 93 94 94 sw4 { 95 95 label = "sw4"; ··· 160 164 161 165 &ohci1 { 162 166 status = "okay"; 163 - }; 164 - 165 - &pio { 166 - leds_opc: led_pins { 167 - pins = "PA15"; 168 - function = "gpio_out"; 169 - }; 170 - }; 171 - 172 - &r_pio { 173 - leds_r_opc: led_pins { 174 - pins = "PL10"; 175 - function = "gpio_out"; 176 - }; 177 - 178 - sw_r_opc: key_pins { 179 - pins = "PL3"; 180 - function = "gpio_in"; 181 - }; 182 167 }; 183 168 184 169 &reg_usb0_vbus {
-23
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
··· 73 73 74 74 leds { 75 75 compatible = "gpio-leds"; 76 - pinctrl-names = "default"; 77 - pinctrl-0 = <&leds_opc>, <&leds_r_opc>; 78 76 79 77 pwr_led { 80 78 label = "orangepi:green:pwr"; ··· 88 90 89 91 r_gpio_keys { 90 92 compatible = "gpio-keys"; 91 - pinctrl-names = "default"; 92 - pinctrl-0 = <&sw_r_opc>; 93 93 94 94 sw4 { 95 95 label = "sw4"; ··· 175 179 status = "okay"; 176 180 }; 177 181 178 - &pio { 179 - leds_opc: led_pins { 180 - pins = "PA15"; 181 - function = "gpio_out"; 182 - }; 183 - }; 184 - 185 182 &r_i2c { 186 183 status = "okay"; 187 184 ··· 196 207 regulator-max-microvolt = <1300000>; 197 208 regulator-boot-on; 198 209 regulator-always-on; 199 - }; 200 - }; 201 - 202 - &r_pio { 203 - leds_r_opc: led_pins { 204 - pins = "PL10"; 205 - function = "gpio_out"; 206 - }; 207 - 208 - sw_r_opc: key_pins { 209 - pins = "PL3"; 210 - function = "gpio_in"; 211 210 }; 212 211 }; 213 212
-9
arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
··· 63 63 64 64 reg_usb3_vbus: usb3-vbus { 65 65 compatible = "regulator-fixed"; 66 - pinctrl-names = "default"; 67 - pinctrl-0 = <&usb3_vbus_pin_a>; 68 66 regulator-name = "usb3-vbus"; 69 67 regulator-min-microvolt = <5000000>; 70 68 regulator-max-microvolt = <5000000>; ··· 112 114 drive-strength = <40>; 113 115 /* eMMC is missing pull-ups */ 114 116 bias-pull-up; 115 - }; 116 - 117 - &pio { 118 - usb3_vbus_pin_a: usb3_vbus_pin { 119 - pins = "PG11"; 120 - function = "gpio_out"; 121 - }; 122 117 }; 123 118 124 119 &r_i2c {