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

ARM: dts: sun4i: Remove all useless pinctrl nodes

The gpio pinctrl nodes are redundant and as such useless most of the times.
Since they will also generate warnings in DTC, we can simply remove most of
them.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

-182
-16
arch/arm/boot/dts/sun4i-a10-a1000.dts
··· 62 62 63 63 leds { 64 64 compatible = "gpio-leds"; 65 - pinctrl-names = "default"; 66 - pinctrl-0 = <&led_pins_a1000>; 67 65 68 66 red { 69 67 label = "a1000:red:usr"; ··· 77 79 78 80 reg_emac_3v3: emac-3v3 { 79 81 compatible = "regulator-fixed"; 80 - pinctrl-names = "default"; 81 - pinctrl-0 = <&emac_power_pin_a1000>; 82 82 regulator-name = "emac-3v3"; 83 83 regulator-min-microvolt = <3300000>; 84 84 regulator-max-microvolt = <3300000>; ··· 181 185 182 186 &ohci1 { 183 187 status = "okay"; 184 - }; 185 - 186 - &pio { 187 - emac_power_pin_a1000: emac_power_pin@0 { 188 - pins = "PH15"; 189 - function = "gpio_out"; 190 - }; 191 - 192 - led_pins_a1000: led_pins@0 { 193 - pins = "PH10", "PH20"; 194 - function = "gpio_out"; 195 - }; 196 188 }; 197 189 198 190 #include "axp209.dtsi"
-6
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
··· 125 125 status = "okay"; 126 126 }; 127 127 128 - &pio { 129 - usb2_vbus_pin_a: usb2_vbus_pin@0 { 130 - pins = "PH12"; 131 - }; 132 - }; 133 - 134 128 &reg_usb0_vbus { 135 129 regulator-boot-on; 136 130 status = "okay";
-28
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
··· 58 58 59 59 backlight: backlight { 60 60 compatible = "pwm-backlight"; 61 - pinctrl-names = "default"; 62 - pinctrl-0 = <&bl_en_pin_dsrv9703c>; 63 61 pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; 64 62 brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; 65 63 default-brightness-level = <8>; ··· 77 79 78 80 reg_motor: reg_motor { 79 81 compatible = "regulator-fixed"; 80 - pinctrl-names = "default"; 81 - pinctrl-0 = <&motor_pins>; 82 82 regulator-name = "vcc-motor"; 83 83 regulator-min-microvolt = <3000000>; 84 84 regulator-max-microvolt = <3000000>; ··· 86 90 }; 87 91 88 92 &codec { 89 - pinctrl-names = "default"; 90 - pinctrl-0 = <&codec_pa_pin>; 91 93 allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ 92 94 status = "okay"; 93 95 }; ··· 128 134 reg = <0x38>; 129 135 interrupt-parent = <&pio>; 130 136 interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; 131 - pinctrl-names = "default"; 132 - pinctrl-0 = <&touchscreen_pins>; 133 137 reset-gpios = <&pio 1 13 GPIO_ACTIVE_LOW>; 134 138 touchscreen-size-x = <1024>; 135 139 touchscreen-size-y = <768>; ··· 168 176 }; 169 177 170 178 &pio { 171 - bl_en_pin_dsrv9703c: bl_en_pin@0 { 172 - pins = "PH7"; 173 - function = "gpio_out"; 174 - }; 175 - 176 - codec_pa_pin: codec_pa_pin@0 { 177 - pins = "PH15"; 178 - function = "gpio_out"; 179 - }; 180 - 181 - motor_pins: motor_pins@0 { 182 - pins = "PB3"; 183 - function = "gpio_out"; 184 - }; 185 - 186 - touchscreen_pins: touchscreen_pins@0 { 187 - pins = "PB13"; 188 - function = "gpio_out"; 189 - }; 190 - 191 179 usb0_id_detect_pin: usb0_id_detect_pin@0 { 192 180 pins = "PH4"; 193 181 function = "gpio_in";
-9
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
··· 72 72 */ 73 73 &codec { 74 74 /* PH15 controls power to external amplifier (ft2012q) */ 75 - pinctrl-names = "default"; 76 - pinctrl-0 = <&codec_pa_pin>; 77 75 allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; 78 76 status = "okay"; 79 77 }; ··· 150 152 cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH01 */ 151 153 cd-inverted; 152 154 status = "okay"; 153 - }; 154 - 155 - &pio { 156 - codec_pa_pin: codec_pa_pin@0 { 157 - pins = "PH15"; 158 - function = "gpio_out"; 159 - }; 160 155 }; 161 156 162 157 &reg_dcdc2 {
-16
arch/arm/boot/dts/sun4i-a10-hackberry.dts
··· 123 123 status = "okay"; 124 124 }; 125 125 126 - &pio { 127 - pinctrl-names = "default"; 128 - pinctrl-0 = <&hackberry_hogs>; 129 - 130 - hackberry_hogs: hogs@0 { 131 - pins = "PH19"; 132 - function = "gpio_out"; 133 - }; 134 - 135 - usb2_vbus_pin_hackberry: usb2_vbus_pin@0 { 136 - pins = "PH12"; 137 - function = "gpio_out"; 138 - }; 139 - }; 140 - 141 126 &reg_usb1_vbus { 142 127 status = "okay"; 143 128 }; 144 129 145 130 &reg_usb2_vbus { 146 - pinctrl-0 = <&usb2_vbus_pin_hackberry>; 147 131 gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; 148 132 status = "okay"; 149 133 };
-14
arch/arm/boot/dts/sun4i-a10-inet1.dts
··· 58 58 59 59 backlight: backlight { 60 60 compatible = "pwm-backlight"; 61 - pinctrl-names = "default"; 62 - pinctrl-0 = <&bl_en_pin_inet>; 63 61 pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; 64 62 brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; 65 63 default-brightness-level = <8>; ··· 122 124 reg = <0x38>; 123 125 interrupt-parent = <&pio>; 124 126 interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; 125 - pinctrl-names = "default"; 126 - pinctrl-0 = <&touchscreen_wake_pin>; 127 127 wake-gpios = <&pio 1 13 GPIO_ACTIVE_HIGH>; /* PB13 */ 128 128 touchscreen-size-x = <600>; 129 129 touchscreen-size-y = <1024>; ··· 174 178 }; 175 179 176 180 &pio { 177 - bl_en_pin_inet: bl_en_pin@0 { 178 - pins = "PH7"; 179 - function = "gpio_out"; 180 - }; 181 - 182 - touchscreen_wake_pin: touchscreen_wake_pin@0 { 183 - pins = "PB13"; 184 - function = "gpio_out"; 185 - }; 186 - 187 181 usb0_id_detect_pin: usb0_id_detect_pin@0 { 188 182 pins = "PH4"; 189 183 function = "gpio_in";
-16
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
··· 62 62 63 63 leds { 64 64 compatible = "gpio-leds"; 65 - pinctrl-names = "default"; 66 - pinctrl-0 = <&led_pins_q5>; 67 65 68 66 green { 69 67 label = "q5:green:usr"; ··· 72 74 73 75 reg_emac_3v3: emac-3v3 { 74 76 compatible = "regulator-fixed"; 75 - pinctrl-names = "default"; 76 - pinctrl-0 = <&emac_power_pin_q5>; 77 77 regulator-name = "emac-3v3"; 78 78 regulator-min-microvolt = <3300000>; 79 79 regulator-max-microvolt = <3300000>; ··· 154 158 155 159 &otg_sram { 156 160 status = "okay"; 157 - }; 158 - 159 - &pio { 160 - emac_power_pin_q5: emac_power_pin@0 { 161 - pins = "PH19"; 162 - function = "gpio_out"; 163 - }; 164 - 165 - led_pins_q5: led_pins@0 { 166 - pins = "PH20"; 167 - function = "gpio_out"; 168 - }; 169 161 }; 170 162 171 163 &reg_usb0_vbus {
-7
arch/arm/boot/dts/sun4i-a10-marsboard.dts
··· 61 61 62 62 leds { 63 63 compatible = "gpio-leds"; 64 - pinctrl-names = "default"; 65 - pinctrl-0 = <&led_pins_marsboard>; 66 64 67 65 red1 { 68 66 label = "marsboard:red1:usr"; ··· 160 162 }; 161 163 162 164 &pio { 163 - led_pins_marsboard: led_pins@0 { 164 - pins = "PB5", "PB6", "PB7", "PB8"; 165 - function = "gpio_out"; 166 - }; 167 - 168 165 usb0_id_detect_pin: usb0_id_detect_pin@0 { 169 166 pins = "PH4"; 170 167 function = "gpio_in";
-20
arch/arm/boot/dts/sun4i-a10-mk802.dts
··· 88 88 status = "okay"; 89 89 }; 90 90 91 - &pio { 92 - usb0_id_detect_pin: usb0_id_detect_pin@0 { 93 - pins = "PH4"; 94 - function = "gpio_in"; 95 - }; 96 - 97 - usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { 98 - pins = "PH5"; 99 - function = "gpio_in"; 100 - }; 101 - 102 - usb2_vbus_pin_mk802: usb2_vbus_pin@0 { 103 - pins = "PH12"; 104 - function = "gpio_out"; 105 - }; 106 - }; 107 - 108 91 &reg_usb0_vbus { 109 92 status = "okay"; 110 93 }; ··· 97 114 }; 98 115 99 116 &reg_usb2_vbus { 100 - pinctrl-0 = <&usb2_vbus_pin_mk802>; 101 117 gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */ 102 118 status = "okay"; 103 119 }; ··· 113 131 }; 114 132 115 133 &usbphy { 116 - pinctrl-names = "default"; 117 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 118 134 usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 119 135 usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 120 136 usb0_vbus-supply = <&reg_usb0_vbus>;
-6
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
··· 166 166 }; 167 167 168 168 &pio { 169 - ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { 170 - pins = "PC3"; 171 - function = "gpio_out"; 172 - }; 173 - 174 169 led_pins_olinuxinolime: led_pins@0 { 175 170 pins = "PH2"; 176 171 function = "gpio_out"; ··· 186 191 }; 187 192 188 193 &reg_ahci_5v { 189 - pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; 190 194 gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; 191 195 status = "okay"; 192 196 };
-14
arch/arm/boot/dts/sun4i-a10-pcduino.dts
··· 62 62 63 63 leds { 64 64 compatible = "gpio-leds"; 65 - pinctrl-names = "default"; 66 - pinctrl-0 = <&led_pins_pcduino>; 67 65 68 66 tx { 69 67 label = "pcduino:green:tx"; ··· 76 78 77 79 gpio_keys { 78 80 compatible = "gpio-keys"; 79 - pinctrl-names = "default"; 80 - pinctrl-0 = <&key_pins_pcduino>; 81 81 #address-cells = <1>; 82 82 #size-cells = <0>; 83 83 ··· 164 168 }; 165 169 166 170 &pio { 167 - led_pins_pcduino: led_pins@0 { 168 - pins = "PH15", "PH16"; 169 - function = "gpio_out"; 170 - }; 171 - 172 - key_pins_pcduino: key_pins@0 { 173 - pins = "PH17", "PH18", "PH19"; 174 - function = "gpio_in"; 175 - }; 176 - 177 171 usb0_id_detect_pin: usb0_id_detect_pin@0 { 178 172 pins = "PH4"; 179 173 function = "gpio_in";
-9
arch/arm/boot/dts/sun4i-a10-pcduino2.dts
··· 55 55 compatible = "linksprite,a10-pcduino2", "allwinner,sun4i-a10"; 56 56 }; 57 57 58 - &pio { 59 - usb2_vbus_pin_pcduino2: usb2_vbus_pin@0 { 60 - pins = "PD2"; 61 - function = "gpio_out"; 62 - }; 63 - }; 64 - 65 58 &reg_usb2_vbus { 66 - pinctrl-names = "default"; 67 - pinctrl-0 = <&usb2_vbus_pin_pcduino2>; 68 59 gpio = <&pio 3 2 GPIO_ACTIVE_HIGH>; 69 60 status = "okay"; 70 61 };
-21
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
··· 58 58 59 59 backlight: backlight { 60 60 compatible = "pwm-backlight"; 61 - pinctrl-names = "default"; 62 - pinctrl-0 = <&bl_en_pin_protab>; 63 61 pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; 64 62 brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; 65 63 default-brightness-level = <8>; ··· 70 72 }; 71 73 72 74 &codec { 73 - pinctrl-names = "default"; 74 - pinctrl-0 = <&codec_pa_pin>; 75 75 allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ 76 76 status = "okay"; 77 77 }; ··· 108 112 status = "okay"; 109 113 110 114 pixcir_ts@5c { 111 - pinctrl-names = "default"; 112 - pinctrl-0 = <&touchscreen_pins>; 113 115 compatible = "pixcir,pixcir_tangoc"; 114 116 reg = <0x5c>; 115 117 interrupt-parent = <&pio>; ··· 156 162 }; 157 163 158 164 &pio { 159 - bl_en_pin_protab: bl_en_pin@0 { 160 - pins = "PH7"; 161 - function = "gpio_out"; 162 - }; 163 - 164 - codec_pa_pin: codec_pa_pin@0 { 165 - pins = "PH15"; 166 - function = "gpio_out"; 167 - }; 168 - 169 - touchscreen_pins: touchscreen_pins@0 { 170 - pins = "PA5", "PB13"; 171 - function = "gpio_out"; 172 - }; 173 - 174 165 usb0_id_detect_pin: usb0_id_detect_pin@0 { 175 166 pins = "PH4"; 176 167 function = "gpio_in";