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: sunxi: common-regulators: Drop pinmux settings for GPIO pins

As part of our effort to move pinctrl/GPIO interlocking into the
driver where it belongs, this patch drops the definition and usage
of the pinmux settings for the common regulators defined in
sunxi-common-regulators.dtsi.

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

authored by

Chen-Yu Tsai and committed by
Maxime Ripard 8a92770b e53bfb02

-88
-4
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
··· 120 120 status = "okay"; 121 121 }; 122 122 123 - &usb2_vbus_pin_a { 124 - pins = "PH6"; 125 - }; 126 - 127 123 &usb_otg { 128 124 dr_mode = "otg"; 129 125 status = "okay";
-8
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
··· 136 136 status = "okay"; 137 137 }; 138 138 139 - &usb0_vbus_pin_a { 140 - pins = "PG13"; 141 - }; 142 - 143 - &usb1_vbus_pin_a { 144 - pins = "PB10"; 145 - }; 146 - 147 139 &usb_otg { 148 140 dr_mode = "host"; 149 141 status = "okay";
-4
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
··· 168 168 status = "okay"; 169 169 }; 170 170 171 - &usb1_vbus_pin_a { 172 - pins = "PG13"; 173 - }; 174 - 175 171 &usbphy { 176 172 pinctrl-names = "default"; 177 173 pinctrl-0 = <&usb0_id_detect_pin>;
-4
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
··· 271 271 status = "okay"; 272 272 }; 273 273 274 - &usb0_vbus_pin_a { 275 - pins = "PG11"; 276 - }; 277 - 278 274 &usbphy { 279 275 pinctrl-names = "default"; 280 276 pinctrl-0 = <&usb0_id_detect_pin>;
-4
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
··· 216 216 status = "okay"; 217 217 }; 218 218 219 - &usb1_vbus_pin_a { 220 - pins = "PG12"; 221 - }; 222 - 223 219 &usbphy { 224 220 usb1_vbus-supply = <&reg_usb1_vbus>; 225 221 status = "okay";
-4
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
··· 207 207 status = "okay"; 208 208 }; 209 209 210 - &usb0_vbus_pin_a { 211 - pins = "PG12"; 212 - }; 213 - 214 210 &usbphy { 215 211 pinctrl-names = "default"; 216 212 pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
-5
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
··· 186 186 }; 187 187 188 188 &reg_usb0_vbus { 189 - pinctrl-0 = <&usb0_vbus_pin_a>; 190 189 gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ 191 190 status = "okay"; 192 191 }; ··· 199 200 &usb_otg { 200 201 dr_mode = "otg"; 201 202 status = "okay"; 202 - }; 203 - 204 - &usb0_vbus_pin_a { 205 - pins = "PG12"; 206 203 }; 207 204 208 205 &usbphy {
-4
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
··· 269 269 status = "okay"; 270 270 }; 271 271 272 - &usb0_vbus_pin_a { 273 - pins = "PG12"; 274 - }; 275 - 276 272 &usbphy { 277 273 pinctrl-names = "default"; 278 274 pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
-5
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
··· 344 344 status = "okay"; 345 345 }; 346 346 347 - &usb1_vbus_pin_a { 348 - /* different pin from sunxi-common-regulators */ 349 - pins = "PH24"; 350 - }; 351 - 352 347 &usbphy { 353 348 usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ 354 349 usb0_vbus_det-gpio = <&pio 0 16 GPIO_ACTIVE_HIGH>; /* PA16 */
-8
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
··· 85 85 }; 86 86 }; 87 87 88 - &ahci_pwr_pin_a { 89 - pins = "PB3"; 90 - }; 91 - 92 88 &ahci { 93 89 target-supply = <&reg_ahci_5v>; 94 90 status = "okay"; ··· 313 317 314 318 &usb_power_supply { 315 319 status = "okay"; 316 - }; 317 - 318 - &usb2_vbus_pin_a { 319 - pins = "PH12"; 320 320 }; 321 321 322 322 &usbphy {
-4
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
··· 106 106 status = "okay"; 107 107 }; 108 108 109 - &ahci_pwr_pin_a { 110 - pins = "PH2"; 111 - }; 112 - 113 109 &codec { 114 110 status = "okay"; 115 111 };
-4
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
··· 195 195 status = "disabled"; 196 196 }; 197 197 198 - &usb1_vbus_pin_a { 199 - pins = "PG13"; 200 - }; 201 - 202 198 &usbphy { 203 199 usb1_vbus-supply = <&reg_usb1_vbus>; 204 200 status = "okay";
-30
arch/arm/boot/dts/sunxi-common-regulators.dtsi
··· 44 44 45 45 #include <dt-bindings/gpio/gpio.h> 46 46 47 - &pio { 48 - ahci_pwr_pin_a: ahci_pwr_pin@0 { 49 - pins = "PB8"; 50 - function = "gpio_out"; 51 - }; 52 - 53 - usb0_vbus_pin_a: usb0_vbus_pin@0 { 54 - pins = "PB9"; 55 - function = "gpio_out"; 56 - }; 57 - 58 - usb1_vbus_pin_a: usb1_vbus_pin@0 { 59 - pins = "PH6"; 60 - function = "gpio_out"; 61 - }; 62 - 63 - usb2_vbus_pin_a: usb2_vbus_pin@0 { 64 - pins = "PH3"; 65 - function = "gpio_out"; 66 - }; 67 - }; 68 - 69 47 / { 70 48 reg_ahci_5v: ahci-5v { 71 49 compatible = "regulator-fixed"; 72 - pinctrl-names = "default"; 73 - pinctrl-0 = <&ahci_pwr_pin_a>; 74 50 regulator-name = "ahci-5v"; 75 51 regulator-min-microvolt = <5000000>; 76 52 regulator-max-microvolt = <5000000>; ··· 58 82 59 83 reg_usb0_vbus: usb0-vbus { 60 84 compatible = "regulator-fixed"; 61 - pinctrl-names = "default"; 62 - pinctrl-0 = <&usb0_vbus_pin_a>; 63 85 regulator-name = "usb0-vbus"; 64 86 regulator-min-microvolt = <5000000>; 65 87 regulator-max-microvolt = <5000000>; ··· 68 94 69 95 reg_usb1_vbus: usb1-vbus { 70 96 compatible = "regulator-fixed"; 71 - pinctrl-names = "default"; 72 - pinctrl-0 = <&usb1_vbus_pin_a>; 73 97 regulator-name = "usb1-vbus"; 74 98 regulator-min-microvolt = <5000000>; 75 99 regulator-max-microvolt = <5000000>; ··· 79 107 80 108 reg_usb2_vbus: usb2-vbus { 81 109 compatible = "regulator-fixed"; 82 - pinctrl-names = "default"; 83 - pinctrl-0 = <&usb2_vbus_pin_a>; 84 110 regulator-name = "usb2-vbus"; 85 111 regulator-min-microvolt = <5000000>; 86 112 regulator-max-microvolt = <5000000>;