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: sunxi: Remove pinctrl groups setting bias

So far we've enabled pull-up and pull-down resistors on GPIOs using a
pinctrl node. Now that the GPIO binding allows for a flag to declare this,
let's switch to it.

This brings us closer to removing all the GPIO pinctrl nodes, which will in
turn allow us to switch the pinctrl strict mode on.

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>

Maxime Ripard a107bd2b 612625bb

+73 -514
+2 -18
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts
··· 131 131 status = "okay"; 132 132 }; 133 133 134 - &pio { 135 - usb0_id_detect_pin: usb0-id-detect-pin { 136 - pins = "PH4"; 137 - function = "gpio_in"; 138 - bias-pull-up; 139 - }; 140 - 141 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 142 - pins = "PH5"; 143 - function = "gpio_in"; 144 - bias-pull-down; 145 - }; 146 - }; 147 - 148 134 &reg_usb0_vbus { 149 135 status = "okay"; 150 136 }; ··· 151 165 }; 152 166 153 167 &usbphy { 154 - pinctrl-names = "default"; 155 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 156 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 157 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 168 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 169 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 158 170 usb0_vbus-supply = <&reg_usb0_vbus>; 159 171 usb2_vbus-supply = <&reg_usb2_vbus>; 160 172 status = "okay";
+1 -9
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
··· 184 184 function = "gpio_out"; 185 185 drive-strength = <20>; 186 186 }; 187 - 188 - usb0_id_detect_pin: usb0-id-detect-pin { 189 - pins = "PH4"; 190 - function = "gpio_in"; 191 - bias-pull-up; 192 - }; 193 187 }; 194 188 195 189 &reg_ahci_5v { ··· 248 254 }; 249 255 250 256 &usbphy { 251 - pinctrl-names = "default"; 252 - pinctrl-0 = <&usb0_id_detect_pin>; 253 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 257 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 254 258 usb1_vbus-supply = <&reg_usb1_vbus>; 255 259 usb2_vbus-supply = <&reg_usb2_vbus>; 256 260 status = "okay";
+2 -18
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
··· 158 158 status = "okay"; 159 159 }; 160 160 161 - &pio { 162 - usb0_id_detect_pin: usb0-id-detect-pin { 163 - pins = "PH4"; 164 - function = "gpio_in"; 165 - bias-pull-up; 166 - }; 167 - 168 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 169 - pins = "PH5"; 170 - function = "gpio_in"; 171 - bias-pull-down; 172 - }; 173 - }; 174 - 175 161 &pwm { 176 162 pinctrl-names = "default"; 177 163 pinctrl-0 = <&pwm0_pin>; ··· 209 223 }; 210 224 211 225 &usbphy { 212 - pinctrl-names = "default"; 213 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 214 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 215 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 226 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 227 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 216 228 usb0_vbus-supply = <&reg_usb0_vbus>; 217 229 usb2_vbus-supply = <&reg_usb2_vbus>; 218 230 status = "okay";
+2 -18
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
··· 86 86 status = "okay"; 87 87 }; 88 88 89 - &pio { 90 - usb0_id_detect_pin: usb0-id-detect-pin { 91 - pins = "PH4"; 92 - function = "gpio_in"; 93 - bias-pull-up; 94 - }; 95 - 96 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 97 - pins = "PH5"; 98 - function = "gpio_in"; 99 - bias-pull-down; 100 - }; 101 - }; 102 - 103 89 &reg_usb0_vbus { 104 90 status = "okay"; 105 91 }; ··· 107 121 }; 108 122 109 123 &usbphy { 110 - pinctrl-names = "default"; 111 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 112 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 113 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 124 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 125 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 114 126 usb0_vbus-supply = <&reg_usb0_vbus>; 115 127 usb2_vbus-supply = <&reg_usb2_vbus>; 116 128 status = "okay";
+2 -18
arch/arm/boot/dts/sun4i-a10-inet1.dts
··· 164 164 status = "okay"; 165 165 }; 166 166 167 - &pio { 168 - usb0_id_detect_pin: usb0-id-detect-pin { 169 - pins = "PH4"; 170 - function = "gpio_in"; 171 - bias-pull-up; 172 - }; 173 - 174 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 175 - pins = "PH5"; 176 - function = "gpio_in"; 177 - bias-pull-down; 178 - }; 179 - }; 180 - 181 167 &pwm { 182 168 pinctrl-names = "default"; 183 169 pinctrl-0 = <&pwm0_pin>; ··· 219 233 }; 220 234 221 235 &usbphy { 222 - pinctrl-names = "default"; 223 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 224 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 225 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 236 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 237 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 226 238 usb0_vbus-supply = <&reg_usb0_vbus>; 227 239 usb1_vbus-supply = <&reg_usb1_vbus>; 228 240 usb2_vbus-supply = <&reg_usb2_vbus>;
+2 -18
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
··· 150 150 status = "okay"; 151 151 }; 152 152 153 - &pio { 154 - usb0_id_detect_pin: usb0-id-detect-pin { 155 - pins = "PH4"; 156 - function = "gpio_in"; 157 - bias-pull-up; 158 - }; 159 - 160 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 161 - pins = "PH5"; 162 - function = "gpio_in"; 163 - bias-pull-down; 164 - }; 165 - }; 166 - 167 153 &reg_dcdc2 { 168 154 regulator-always-on; 169 155 regulator-min-microvolt = <1000000>; ··· 195 209 }; 196 210 197 211 &usbphy { 198 - pinctrl-names = "default"; 199 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 200 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 201 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 212 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 213 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 202 214 usb0_vbus-supply = <&reg_usb0_vbus>; 203 215 usb2_vbus-supply = <&reg_usb2_vbus>; 204 216 status = "okay";
+22 -50
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
··· 61 61 62 62 gpio-keys { 63 63 compatible = "gpio-keys-polled"; 64 - pinctrl-names = "default"; 65 - pinctrl-0 = <&key_pins_inet9f>; 66 64 poll-interval = <20>; 67 65 68 66 left-joystick-left { ··· 68 70 linux,code = <ABS_X>; 69 71 linux,input-type = <EV_ABS>; 70 72 linux,input-value = <0xffffffff>; /* -1 */ 71 - gpios = <&pio 0 6 GPIO_ACTIVE_LOW>; /* PA6 */ 73 + gpios = <&pio 0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA6 */ 72 74 }; 73 75 74 76 left-joystick-right { ··· 76 78 linux,code = <ABS_X>; 77 79 linux,input-type = <EV_ABS>; 78 80 linux,input-value = <1>; 79 - gpios = <&pio 0 5 GPIO_ACTIVE_LOW>; /* PA5 */ 81 + gpios = <&pio 0 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA5 */ 80 82 }; 81 83 82 84 left-joystick-up { ··· 84 86 linux,code = <ABS_Y>; 85 87 linux,input-type = <EV_ABS>; 86 88 linux,input-value = <0xffffffff>; /* -1 */ 87 - gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ 89 + gpios = <&pio 0 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA8 */ 88 90 }; 89 91 90 92 left-joystick-down { ··· 92 94 linux,code = <ABS_Y>; 93 95 linux,input-type = <EV_ABS>; 94 96 linux,input-value = <1>; 95 - gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */ 97 + gpios = <&pio 0 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA9 */ 96 98 }; 97 99 98 100 right-joystick-left { ··· 100 102 linux,code = <ABS_Z>; 101 103 linux,input-type = <EV_ABS>; 102 104 linux,input-value = <0xffffffff>; /* -1 */ 103 - gpios = <&pio 0 1 GPIO_ACTIVE_LOW>; /* PA1 */ 105 + gpios = <&pio 0 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA1 */ 104 106 }; 105 107 106 108 right-joystick-right { ··· 108 110 linux,code = <ABS_Z>; 109 111 linux,input-type = <EV_ABS>; 110 112 linux,input-value = <1>; 111 - gpios = <&pio 0 0 GPIO_ACTIVE_LOW>; /* PA0 */ 113 + gpios = <&pio 0 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA0 */ 112 114 }; 113 115 114 116 right-joystick-up { ··· 116 118 linux,code = <ABS_RZ>; 117 119 linux,input-type = <EV_ABS>; 118 120 linux,input-value = <0xffffffff>; /* -1 */ 119 - gpios = <&pio 0 3 GPIO_ACTIVE_LOW>; /* PA3 */ 121 + gpios = <&pio 0 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA3 */ 120 122 }; 121 123 122 124 right-joystick-down { ··· 124 126 linux,code = <ABS_RZ>; 125 127 linux,input-type = <EV_ABS>; 126 128 linux,input-value = <1>; 127 - gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */ 129 + gpios = <&pio 0 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA4 */ 128 130 }; 129 131 130 132 dpad-left { ··· 132 134 linux,code = <ABS_HAT0X>; 133 135 linux,input-type = <EV_ABS>; 134 136 linux,input-value = <0xffffffff>; /* -1 */ 135 - gpios = <&pio 7 23 GPIO_ACTIVE_LOW>; /* PH23 */ 137 + gpios = <&pio 7 23 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH23 */ 136 138 }; 137 139 138 140 dpad-right { ··· 140 142 linux,code = <ABS_HAT0X>; 141 143 linux,input-type = <EV_ABS>; 142 144 linux,input-value = <1>; 143 - gpios = <&pio 7 24 GPIO_ACTIVE_LOW>; /* PH24 */ 145 + gpios = <&pio 7 24 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH24 */ 144 146 }; 145 147 146 148 dpad-up { ··· 148 150 linux,code = <ABS_HAT0Y>; 149 151 linux,input-type = <EV_ABS>; 150 152 linux,input-value = <0xffffffff>; /* -1 */ 151 - gpios = <&pio 7 25 GPIO_ACTIVE_LOW>; /* PH25 */ 153 + gpios = <&pio 7 25 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH25 */ 152 154 }; 153 155 154 156 dpad-down { ··· 156 158 linux,code = <ABS_HAT0Y>; 157 159 linux,input-type = <EV_ABS>; 158 160 linux,input-value = <1>; 159 - gpios = <&pio 7 26 GPIO_ACTIVE_LOW>; /* PH26 */ 161 + gpios = <&pio 7 26 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH26 */ 160 162 }; 161 163 162 164 x { 163 165 label = "Button X"; 164 166 linux,code = <BTN_X>; 165 - gpios = <&pio 0 16 GPIO_ACTIVE_LOW>; /* PA16 */ 167 + gpios = <&pio 0 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA16 */ 166 168 }; 167 169 168 170 y { 169 171 label = "Button Y"; 170 172 linux,code = <BTN_Y>; 171 - gpios = <&pio 0 14 GPIO_ACTIVE_LOW>; /* PA14 */ 173 + gpios = <&pio 0 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA14 */ 172 174 }; 173 175 174 176 a { 175 177 label = "Button A"; 176 178 linux,code = <BTN_A>; 177 - gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */ 179 + gpios = <&pio 0 17 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA17 */ 178 180 }; 179 181 180 182 b { 181 183 label = "Button B"; 182 184 linux,code = <BTN_B>; 183 - gpios = <&pio 0 15 GPIO_ACTIVE_LOW>; /* PA15 */ 185 + gpios = <&pio 0 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA15 */ 184 186 }; 185 187 186 188 select { 187 189 label = "Select Button"; 188 190 linux,code = <BTN_SELECT>; 189 - gpios = <&pio 0 11 GPIO_ACTIVE_LOW>; /* PA11 */ 191 + gpios = <&pio 0 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA11 */ 190 192 }; 191 193 192 194 start { 193 195 label = "Start Button"; 194 196 linux,code = <BTN_START>; 195 - gpios = <&pio 0 12 GPIO_ACTIVE_LOW>; /* PA12 */ 197 + gpios = <&pio 0 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA12 */ 196 198 }; 197 199 198 200 top-left { 199 201 label = "Top Left Button"; 200 202 linux,code = <BTN_TL>; 201 - gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ 203 + gpios = <&pio 7 22 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH22 */ 202 204 }; 203 205 204 206 top-right { 205 207 label = "Top Right Button"; 206 208 linux,code = <BTN_TR>; 207 - gpios = <&pio 0 13 GPIO_ACTIVE_LOW>; /* PA13 */ 209 + gpios = <&pio 0 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA13 */ 208 210 }; 209 211 }; 210 212 }; ··· 304 306 status = "okay"; 305 307 }; 306 308 307 - &pio { 308 - key_pins_inet9f: key-pins { 309 - pins = "PA0", "PA1", "PA3", "PA4", 310 - "PA5", "PA6", "PA8", "PA9", 311 - "PA11", "PA12", "PA13", 312 - "PA14", "PA15", "PA16", "PA17", 313 - "PH22", "PH23", "PH24", "PH25", "PH26"; 314 - function = "gpio_in"; 315 - bias-pull-up; 316 - }; 317 - 318 - usb0_id_detect_pin: usb0-id-detect-pin { 319 - pins = "PH4"; 320 - function = "gpio_in"; 321 - bias-pull-up; 322 - }; 323 - 324 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 325 - pins = "PH5"; 326 - function = "gpio_in"; 327 - bias-pull-down; 328 - }; 329 - }; 330 - 331 309 &reg_dcdc2 { 332 310 regulator-always-on; 333 311 regulator-min-microvolt = <1000000>; ··· 349 375 }; 350 376 351 377 &usbphy { 352 - pinctrl-names = "default"; 353 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 354 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 355 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 378 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 379 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 356 380 usb0_vbus-supply = <&reg_usb0_vbus>; 357 381 usb2_vbus-supply = <&reg_usb2_vbus>; 358 382 status = "okay";
+1 -11
arch/arm/boot/dts/sun4i-a10-marsboard.dts
··· 148 148 status = "okay"; 149 149 }; 150 150 151 - &pio { 152 - usb0_id_detect_pin: usb0-id-detect-pin { 153 - pins = "PH4"; 154 - function = "gpio_in"; 155 - bias-pull-up; 156 - }; 157 - }; 158 - 159 151 &reg_usb1_vbus { 160 152 status = "okay"; 161 153 }; ··· 175 183 }; 176 184 177 185 &usbphy { 178 - pinctrl-names = "default"; 179 - pinctrl-0 = <&usb0_id_detect_pin>; 180 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 186 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 181 187 usb1_vbus-supply = <&reg_usb1_vbus>; 182 188 usb2_vbus-supply = <&reg_usb2_vbus>; 183 189 status = "okay";
+2 -16
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
··· 186 186 function = "gpio_out"; 187 187 drive-strength = <20>; 188 188 }; 189 - 190 - usb0_id_detect_pin: usb0-id-detect-pin { 191 - pins = "PH4"; 192 - function = "gpio_in"; 193 - bias-pull-up; 194 - }; 195 - 196 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 197 - pins = "PH5"; 198 - function = "gpio_in"; 199 - bias-pull-down; 200 - }; 201 189 }; 202 190 203 191 &reg_ahci_5v { ··· 217 229 }; 218 230 219 231 &usbphy { 220 - pinctrl-names = "default"; 221 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 222 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 223 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 232 + usb0_id_det-gpio = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 233 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH5 */ 224 234 usb0_vbus-supply = <&reg_usb0_vbus>; 225 235 usb1_vbus-supply = <&reg_usb1_vbus>; 226 236 usb2_vbus-supply = <&reg_usb2_vbus>;
+1 -11
arch/arm/boot/dts/sun4i-a10-pcduino.dts
··· 154 154 status = "okay"; 155 155 }; 156 156 157 - &pio { 158 - usb0_id_detect_pin: usb0-id-detect-pin { 159 - pins = "PH4"; 160 - function = "gpio_in"; 161 - bias-pull-up; 162 - }; 163 - }; 164 - 165 157 #include "axp209.dtsi" 166 158 167 159 &reg_dcdc2 { ··· 193 201 }; 194 202 195 203 &usbphy { 196 - pinctrl-names = "default"; 197 - pinctrl-0 = <&usb0_id_detect_pin>; 198 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 204 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 199 205 usb1_vbus-supply = <&reg_vcc5v0>; /* USB1 VBUS is always on */ 200 206 usb2_vbus-supply = <&reg_vcc5v0>; /* USB2 VBUS is always on */ 201 207 status = "okay";
+2 -17
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
··· 146 146 status = "okay"; 147 147 }; 148 148 149 - &pio { 150 - usb0_id_detect_pin: usb0-id-detect-pin { 151 - pins = "PH4"; 152 - function = "gpio_in"; 153 - bias-pull-up; 154 - }; 155 - 156 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 157 - pins = "PH5"; 158 - function = "gpio_in"; 159 - bias-pull-down; 160 - }; 161 - }; 162 - 163 149 &pwm { 164 150 pinctrl-names = "default"; 165 151 pinctrl-0 = <&pwm0_pin>; ··· 198 212 199 213 &usbphy { 200 214 pinctrl-names = "default"; 201 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 202 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 203 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 215 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 216 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 204 217 usb0_vbus-supply = <&reg_usb0_vbus>; 205 218 usb1_vbus-supply = <&reg_usb1_vbus>; 206 219 status = "okay";
+1 -9
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
··· 119 119 }; 120 120 121 121 &pio { 122 - usb0_id_detect_pin: usb0-id-detect-pin { 123 - pins = "PG12"; 124 - function = "gpio_in"; 125 - bias-pull-up; 126 - }; 127 - 128 122 led_pins_t004: led-pin { 129 123 pins = "PB2"; 130 124 function = "gpio_out"; ··· 143 149 }; 144 150 145 151 &usbphy { 146 - pinctrl-names = "default"; 147 - pinctrl-0 = <&usb0_id_detect_pin>; 148 - usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ 152 + usb0_id_det-gpios = <&pio 6 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG12 */ 149 153 usb1_vbus-supply = <&reg_usb1_vbus>; 150 154 status = "okay"; 151 155 };
+1 -9
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
··· 218 218 function = "gpio_out"; 219 219 drive-strength = <20>; 220 220 }; 221 - 222 - usb0_id_detect_pin: usb0-id-detect-pin { 223 - pins = "PG12"; 224 - function = "gpio_in"; 225 - bias-pull-up; 226 - }; 227 221 }; 228 222 229 223 &reg_usb0_vbus { ··· 265 271 }; 266 272 267 273 &usbphy { 268 - pinctrl-names = "default"; 269 - pinctrl-0 = <&usb0_id_detect_pin>; 270 - usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ 274 + usb0_id_det-gpios = <&pio 6 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG12 */ 271 275 usb0_vbus-supply = <&reg_usb0_vbus>; 272 276 usb1_vbus-supply = <&reg_usb1_vbus>; 273 277 status = "okay";
+2 -18
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
··· 127 127 status = "okay"; 128 128 }; 129 129 130 - &pio { 131 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 132 - pins = "PG1"; 133 - function = "gpio_in"; 134 - bias-pull-down; 135 - }; 136 - 137 - usb0_id_detect_pin: usb0-id-detect-pin { 138 - pins = "PG2"; 139 - function = "gpio_in"; 140 - bias-pull-up; 141 - }; 142 - }; 143 - 144 130 &pwm { 145 131 pinctrl-names = "default"; 146 132 pinctrl-0 = <&pwm0_pin>; ··· 181 195 }; 182 196 183 197 &usbphy { 184 - pinctrl-names = "default"; 185 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 186 - usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ 187 - usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ 198 + usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */ 199 + usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */ 188 200 usb0_vbus-supply = <&reg_usb0_vbus>; 189 201 usb1_vbus-supply = <&reg_ldo3>; 190 202 status = "okay";
+1 -11
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
··· 124 124 status = "okay"; 125 125 }; 126 126 127 - &pio { 128 - usb0_id_detect_pin: usb0-id-detect-pin { 129 - pins = "PG2"; 130 - function = "gpio_in"; 131 - bias-pull-up; 132 - }; 133 - }; 134 - 135 127 #include "axp209.dtsi" 136 128 137 129 &reg_dcdc2 { ··· 174 182 }; 175 183 176 184 &usbphy { 177 - pinctrl-names = "default"; 178 - pinctrl-0 = <&usb0_id_detect_pin>; 179 - usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ 185 + usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */ 180 186 usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ 181 187 usb0_vbus-supply = <&reg_usb0_vbus>; 182 188 usb1_vbus-supply = <&reg_ldo3>;
+2 -16
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
··· 109 109 function = "gpio_out"; 110 110 drive-strength = <20>; 111 111 }; 112 - 113 - usb0_id_detect_pin: usb0-id-detect-pin { 114 - pins = "PG2"; 115 - function = "gpio_in"; 116 - bias-pull-up; 117 - }; 118 - 119 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 120 - pins = "PG1"; 121 - function = "gpio_in"; 122 - bias-pull-down; 123 - }; 124 112 }; 125 113 126 114 &reg_usb0_vbus { ··· 133 145 }; 134 146 135 147 &usbphy { 136 - pinctrl-names = "default"; 137 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 138 - usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ 139 - usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ 148 + usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */ 149 + usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */ 140 150 usb0_vbus-supply = <&reg_usb0_vbus>; 141 151 usb1_vbus-supply = <&reg_usb1_vbus>; 142 152 status = "okay";
+2 -16
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
··· 202 202 function = "gpio_out"; 203 203 drive-strength = <20>; 204 204 }; 205 - 206 - usb0_id_detect_pin: usb0-id-detect-pin { 207 - pins = "PG2"; 208 - function = "gpio_in"; 209 - bias-pull-up; 210 - }; 211 - 212 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 213 - pins = "PG1"; 214 - function = "gpio_in"; 215 - bias-pull-down; 216 - }; 217 205 }; 218 206 219 207 &reg_usb0_vbus { ··· 239 251 }; 240 252 241 253 &usbphy { 242 - pinctrl-names = "default"; 243 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 244 - usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ 245 - usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ 254 + usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */ 255 + usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */ 246 256 usb0_vbus-supply = <&reg_usb0_vbus>; 247 257 usb1_vbus-supply = <&reg_usb1_vbus>; 248 258 status = "okay";
+2 -12
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
··· 61 61 i2c_lcd: i2c { 62 62 /* The lcd panel i2c interface is hooked up via gpios */ 63 63 compatible = "i2c-gpio"; 64 - pinctrl-names = "default"; 65 - pinctrl-0 = <&i2c_lcd_pins>; 66 - sda-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ 67 - scl-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */ 64 + sda-gpios = <&pio 6 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG12 */ 65 + scl-gpios = <&pio 6 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG10 */ 68 66 i2c-gpio,delay-us = <5>; 69 67 }; 70 68 }; ··· 89 91 reg = <0>; 90 92 compatible = "mmc-card"; 91 93 broken-hpi; 92 - }; 93 - }; 94 - 95 - &pio { 96 - i2c_lcd_pins: i2c-lcd-pin { 97 - pins = "PG10", "PG12"; 98 - function = "gpio_out"; 99 - bias-pull-up; 100 94 }; 101 95 }; 102 96
+1 -11
arch/arm/boot/dts/sun5i-r8-chip.dts
··· 84 84 85 85 onewire { 86 86 compatible = "w1-gpio"; 87 - gpios = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */ 88 - pinctrl-names = "default"; 89 - pinctrl-0 = <&chip_w1_pin>; 87 + gpios = <&pio 3 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PD2 */ 90 88 }; 91 89 }; 92 90 ··· 169 171 170 172 &otg_sram { 171 173 status = "okay"; 172 - }; 173 - 174 - &pio { 175 - chip_w1_pin: chip-w1-pin { 176 - pins = "PD2"; 177 - function = "gpio_in"; 178 - bias-pull-up; 179 - }; 180 174 }; 181 175 182 176 &reg_dcdc2 {
+2 -18
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
··· 132 132 status = "okay"; 133 133 }; 134 134 135 - &pio { 136 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 137 - pins = "PG1"; 138 - function = "gpio_in"; 139 - bias-pull-down; 140 - }; 141 - 142 - usb0_id_detect_pin: usb0-id-detect-pin { 143 - pins = "PG2"; 144 - function = "gpio_in"; 145 - bias-pull-up; 146 - }; 147 - }; 148 - 149 135 &reg_dcdc2 { 150 136 regulator-always-on; 151 137 regulator-min-microvolt = <1000000>; ··· 184 198 }; 185 199 186 200 &usbphy { 187 - pinctrl-names = "default"; 188 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 189 - usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ 190 - usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ 201 + usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */ 202 + usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */ 191 203 usb0_vbus_power-supply = <&usb_power_supply>; 192 204 usb0_vbus-supply = <&reg_usb0_vbus>; 193 205 usb1_vbus-supply = <&reg_ldo3>;
+2 -12
arch/arm/boot/dts/sun6i-a31-colombus.dts
··· 63 63 i2c_lcd: i2c { 64 64 /* The lcd panel i2c interface is hooked up via gpios */ 65 65 compatible = "i2c-gpio"; 66 - pinctrl-names = "default"; 67 - pinctrl-0 = <&i2c_lcd_pins>; 68 - sda-gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>; /* PA23 */ 69 - scl-gpios = <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24 */ 66 + sda-gpios = <&pio 0 23 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA23 */ 67 + scl-gpios = <&pio 0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA24 */ 70 68 i2c-gpio,delay-us = <5>; 71 69 }; 72 70 }; ··· 109 111 bus-width = <4>; 110 112 cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ 111 113 status = "okay"; 112 - }; 113 - 114 - &pio { 115 - i2c_lcd_pins: i2c-lcd-pins { 116 - pins = "PA23", "PA24"; 117 - function = "gpio_out"; 118 - bias-pull-up; 119 - }; 120 114 }; 121 115 122 116 &reg_usb2_vbus {
+1 -11
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
··· 73 73 status = "okay"; 74 74 }; 75 75 76 - &pio { 77 - usb0_id_detect_pin: usb0-id-detect-pin { 78 - pins = "PA15"; 79 - function = "gpio_in"; 80 - bias-pull-up; 81 - }; 82 - }; 83 - 84 76 &p2wi { 85 77 status = "okay"; 86 78 ··· 165 173 }; 166 174 167 175 &usbphy { 168 - pinctrl-names = "default"; 169 - pinctrl-0 = <&usb0_id_detect_pin>; 170 - usb0_id_det-gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ 176 + usb0_id_det-gpios = <&pio 0 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA15 */ 171 177 usb0_vbus_power-supply = <&usb_power_supply>; 172 178 usb0_vbus-supply = <&reg_drivevbus>; 173 179 usb1_vbus-supply = <&reg_dldo1>;
+1 -9
arch/arm/boot/dts/sun7i-a20-bananapi.dts
··· 246 246 "SPI-MISO", "SPI-CE1", "", 247 247 "IO-6", "IO-3", "IO-2", "IO-0", "", "", "", "", 248 248 "", "", "", "", "", "", "", ""; 249 - 250 - usb0_id_detect_pin: usb0-id-detect-pin { 251 - pins = "PH4"; 252 - function = "gpio_in"; 253 - bias-pull-up; 254 - }; 255 249 }; 256 250 257 251 #include "axp209.dtsi" ··· 323 329 }; 324 330 325 331 &usbphy { 326 - pinctrl-names = "default"; 327 - pinctrl-0 = <&usb0_id_detect_pin>; 328 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 332 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 329 333 usb0_vbus_power-supply = <&usb_power_supply>; 330 334 usb0_vbus-supply = <&reg_usb0_vbus>; 331 335 usb1_vbus-supply = <&reg_usb1_vbus>;
+1 -11
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
··· 173 173 status = "okay"; 174 174 }; 175 175 176 - &pio { 177 - usb0_id_detect_pin: usb0-id-detect-pin { 178 - pins = "PH4"; 179 - function = "gpio_in"; 180 - bias-pull-up; 181 - }; 182 - }; 183 - 184 176 &reg_ahci_5v { 185 177 status = "okay"; 186 178 }; ··· 228 236 }; 229 237 230 238 &usbphy { 231 - pinctrl-names = "default"; 232 - pinctrl-0 = <&usb0_id_detect_pin>; 233 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 239 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 234 240 usb1_vbus-supply = <&reg_usb1_vbus>; 235 241 usb2_vbus-supply = <&reg_usb2_vbus>; 236 242 status = "okay";
+1 -11
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
··· 229 229 status = "okay"; 230 230 }; 231 231 232 - &pio { 233 - usb0_id_detect_pin: usb0-id-detect-pin { 234 - pins = "PH4"; 235 - function = "gpio_in"; 236 - bias-pull-up; 237 - }; 238 - }; 239 - 240 232 #include "axp209.dtsi" 241 233 242 234 &ac_power_supply { ··· 314 322 }; 315 323 316 324 &usbphy { 317 - pinctrl-names = "default"; 318 - pinctrl-0 = <&usb0_id_detect_pin>; 319 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 325 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 320 326 usb0_vbus_power-supply = <&usb_power_supply>; 321 327 usb0_vbus-supply = <&reg_usb0_vbus>; 322 328 usb2_vbus-supply = <&reg_usb2_vbus>;
+2 -16
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
··· 174 174 function = "gpio_out"; 175 175 drive-strength = <20>; 176 176 }; 177 - 178 - usb0_id_detect_pin: usb0-id-detect-pin { 179 - pins = "PH4"; 180 - function = "gpio_in"; 181 - bias-pull-up; 182 - }; 183 - 184 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 185 - pins = "PH5"; 186 - function = "gpio_in"; 187 - bias-pull-down; 188 - }; 189 177 }; 190 178 191 179 &reg_ahci_5v { ··· 205 217 }; 206 218 207 219 &usbphy { 208 - pinctrl-names = "default"; 209 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 210 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 211 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 220 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 221 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 212 222 usb0_vbus-supply = <&reg_usb0_vbus>; 213 223 usb1_vbus-supply = <&reg_usb1_vbus>; 214 224 usb2_vbus-supply = <&reg_usb2_vbus>;
+2 -16
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
··· 185 185 function = "gpio_out"; 186 186 drive-strength = <20>; 187 187 }; 188 - 189 - usb0_id_detect_pin: usb0-id-detect-pin { 190 - pins = "PH4"; 191 - function = "gpio_in"; 192 - bias-pull-up; 193 - }; 194 - 195 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 196 - pins = "PH5"; 197 - function = "gpio_in"; 198 - bias-pull-down; 199 - }; 200 188 }; 201 189 202 190 &reg_ahci_5v { ··· 261 273 }; 262 274 263 275 &usbphy { 264 - pinctrl-names = "default"; 265 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 266 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 267 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 276 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 277 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 268 278 usb0_vbus-supply = <&reg_usb0_vbus>; 269 279 usb1_vbus-supply = <&reg_usb1_vbus>; 270 280 usb2_vbus-supply = <&reg_usb2_vbus>;
+2 -16
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
··· 252 252 function = "gpio_out"; 253 253 drive-strength = <20>; 254 254 }; 255 - 256 - usb0_id_detect_pin: usb0-id-detect-pin { 257 - pins = "PH4"; 258 - function = "gpio_in"; 259 - bias-pull-up; 260 - }; 261 - 262 - usb0_vbus_detect_pin: usb0-vbus-detect-pin { 263 - pins = "PH5"; 264 - function = "gpio_in"; 265 - bias-pull-down; 266 - }; 267 255 }; 268 256 269 257 #include "axp209.dtsi" ··· 343 355 }; 344 356 345 357 &usbphy { 346 - pinctrl-names = "default"; 347 - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; 348 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 349 - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ 358 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 359 + usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */ 350 360 usb0_vbus-supply = <&reg_usb0_vbus>; 351 361 usb1_vbus-supply = <&reg_usb1_vbus>; 352 362 usb2_vbus-supply = <&reg_usb2_vbus>;
+1 -11
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
··· 176 176 status = "okay"; 177 177 }; 178 178 179 - &pio { 180 - usb0_id_detect_pin: usb0-id-detect-pin { 181 - pins = "PH4"; 182 - function = "gpio_in"; 183 - bias-pull-up; 184 - }; 185 - }; 186 - 187 179 &reg_dcdc2 { 188 180 regulator-always-on; 189 181 regulator-min-microvolt = <1000000>; ··· 231 239 }; 232 240 233 241 &usbphy { 234 - pinctrl-names = "default"; 235 - pinctrl-0 = <&usb0_id_detect_pin>; 236 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 242 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 237 243 usb0_vbus_power-supply = <&usb_power_supply>; 238 244 usb0_vbus-supply = <&reg_usb0_vbus>; 239 245 usb1_vbus-supply = <&reg_usb1_vbus>;
+1 -11
arch/arm/boot/dts/sun7i-a20-orangepi.dts
··· 135 135 status = "okay"; 136 136 }; 137 137 138 - &pio { 139 - usb0_id_detect_pin: usb0-id-detect-pin { 140 - pins = "PH4"; 141 - function = "gpio_in"; 142 - bias-pull-up; 143 - }; 144 - }; 145 - 146 138 &reg_dcdc2 { 147 139 regulator-always-on; 148 140 regulator-min-microvolt = <1000000>; ··· 190 198 }; 191 199 192 200 &usbphy { 193 - pinctrl-names = "default"; 194 - pinctrl-0 = <&usb0_id_detect_pin>; 195 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 201 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 196 202 usb0_vbus_power-supply = <&usb_power_supply>; 197 203 usb0_vbus-supply = <&reg_usb0_vbus>; 198 204 usb1_vbus-supply = <&reg_usb1_vbus>;
+1 -11
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
··· 168 168 status = "okay"; 169 169 }; 170 170 171 - &pio { 172 - usb0_id_detect_pin: usb0-id-detect-pin { 173 - pins = "PH4"; 174 - function = "gpio_in"; 175 - bias-pull-up; 176 - }; 177 - }; 178 - 179 171 &reg_ahci_5v { 180 172 gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ 181 173 status = "okay"; ··· 218 226 }; 219 227 220 228 &usbphy { 221 - pinctrl-names = "default"; 222 - pinctrl-0 = <&usb0_id_detect_pin>; 223 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 229 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 224 230 usb1_vbus-supply = <&reg_usb1_vbus>; 225 231 usb2_vbus-supply = <&reg_usb1_vbus>; 226 232 status = "okay";
+1 -11
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
··· 168 168 status = "okay"; 169 169 }; 170 170 171 - &pio { 172 - usb0_id_detect_pin: usb0-id-detect-pin { 173 - pins = "PH4"; 174 - function = "gpio_in"; 175 - bias-pull-up; 176 - }; 177 - }; 178 - 179 171 &reg_ahci_5v { 180 172 gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; 181 173 status = "okay"; ··· 218 226 }; 219 227 220 228 &usbphy { 221 - pinctrl-names = "default"; 222 - pinctrl-0 = <&usb0_id_detect_pin>; 223 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 229 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 224 230 usb1_vbus-supply = <&reg_usb1_vbus>; 225 231 usb2_vbus-supply = <&reg_usb2_vbus>; 226 232 status = "okay";
+1 -11
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
··· 156 156 status = "okay"; 157 157 }; 158 158 159 - &pio { 160 - usb0_id_detect_pin: usb0-id-detect-pin { 161 - pins = "PH4"; 162 - function = "gpio_in"; 163 - bias-pull-up; 164 - }; 165 - }; 166 - 167 159 &pwm { 168 160 pinctrl-names = "default"; 169 161 pinctrl-0 = <&pwm0_pin>; ··· 215 223 }; 216 224 217 225 &usbphy { 218 - pinctrl-names = "default"; 219 - pinctrl-0 = <&usb0_id_detect_pin>; 220 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 226 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 221 227 usb0_vbus_power-supply = <&usb_power_supply>; 222 228 usb0_vbus-supply = <&reg_usb0_vbus>; 223 229 usb1_vbus-supply = <&reg_usb1_vbus>;
+1 -11
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
··· 145 145 status = "okay"; 146 146 }; 147 147 148 - &pio { 149 - usb0_id_detect_pin: usb0-id-detect-pin { 150 - pins = "PH4"; 151 - function = "gpio_in"; 152 - bias-pull-up; 153 - }; 154 - }; 155 - 156 148 &reg_dcdc2 { 157 149 regulator-always-on; 158 150 regulator-min-microvolt = <1000000>; ··· 198 206 }; 199 207 200 208 &usbphy { 201 - pinctrl-names = "default"; 202 - pinctrl-0 = <&usb0_id_detect_pin>; 203 - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ 209 + usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */ 204 210 usb0_vbus_power-supply = <&usb_power_supply>; 205 211 usb0_vbus-supply = <&reg_usb0_vbus>; 206 212 usb1_vbus-supply = <&reg_usb1_vbus>;
+1 -11
arch/arm/boot/dts/sun8i-r16-parrot.dts
··· 158 158 status = "okay"; 159 159 }; 160 160 161 - &pio { 162 - usb0_id_det: usb0-id-detect-pin { 163 - pins = "PD10"; 164 - function = "gpio_in"; 165 - bias-pull-up; 166 - }; 167 - }; 168 - 169 161 &r_rsb { 170 162 status = "okay"; 171 163 ··· 306 314 307 315 &usbphy { 308 316 status = "okay"; 309 - pinctrl-names = "default"; 310 - pinctrl-0 = <&usb0_id_det>; 311 317 usb0_vbus-supply = <&reg_drivevbus>; 312 - usb0_id_det-gpios = <&pio 3 10 GPIO_ACTIVE_HIGH>; /* PD10 */ 318 + usb0_id_det-gpios = <&pio 3 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PD10 */ 313 319 usb0_vbus_power-supply = <&usb_power_supply>; 314 320 usb1_vbus-supply = <&reg_usb1_vbus>; 315 321 };
+1 -11
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
··· 86 86 status = "okay"; 87 87 }; 88 88 89 - &pio { 90 - usb0_id_detect_pin: usb0-id-detect-pin { 91 - pins = "PH8"; 92 - function = "gpio_in"; 93 - bias-pull-up; 94 - }; 95 - }; 96 - 97 89 &r_rsb { 98 90 status = "okay"; 99 91 ··· 216 224 }; 217 225 218 226 &usbphy { 219 - pinctrl-names = "default"; 220 - pinctrl-0 = <&usb0_id_detect_pin>; 221 - usb0_id_det-gpios = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */ 227 + usb0_id_det-gpios = <&pio 7 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH8 */ 222 228 usb0_vbus_power-supply = <&usb_power_supply>; 223 229 usb0_vbus-supply = <&reg_drivevbus>; 224 230 status = "okay";