Skip to content

L
linux
Commit a107bd2b authored by Maxime Ripard's avatar Maxime Ripard
Browse files
Options

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: default avatarChen-Yu Tsai <wens@csie.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent 612625bb
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 514 deletions
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts
View file @ a107bd2b
...@@ -131,20 +131,6 @@ &otg_sram { ...@@ -131,20 +131,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
&reg_usb0_vbus { &reg_usb0_vbus {
status = "okay"; status = "okay";
}; };
...@@ -165,10 +151,8 @@ &usb_otg { ...@@ -165,10 +151,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
View file @ a107bd2b
...@@ -184,12 +184,6 @@ led_pins_cubieboard: led-pins { ...@@ -184,12 +184,6 @@ led_pins_cubieboard: led-pins {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
}; };
&reg_ahci_5v { &reg_ahci_5v {
...@@ -254,9 +248,7 @@ &usb_otg { ...@@ -254,9 +248,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
View file @ a107bd2b
...@@ -158,20 +158,6 @@ &otg_sram { ...@@ -158,20 +158,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pin>; pinctrl-0 = <&pwm0_pin>;
...@@ -223,10 +209,8 @@ &usb_otg { ...@@ -223,10 +209,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
View file @ a107bd2b
...@@ -86,20 +86,6 @@ &otg_sram { ...@@ -86,20 +86,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
&reg_usb0_vbus { &reg_usb0_vbus {
status = "okay"; status = "okay";
}; };
...@@ -121,10 +107,8 @@ &usb_otg { ...@@ -121,10 +107,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun4i-a10-inet1.dts
View file @ a107bd2b
...@@ -164,20 +164,6 @@ &otg_sram { ...@@ -164,20 +164,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pin>; pinctrl-0 = <&pwm0_pin>;
...@@ -233,10 +219,8 @@ &usb_otg { ...@@ -233,10 +219,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
......
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
View file @ a107bd2b
...@@ -150,20 +150,6 @@ &otg_sram { ...@@ -150,20 +150,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -209,10 +195,8 @@ &usb_otg { ...@@ -209,10 +195,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
View file @ a107bd2b
...@@ -61,8 +61,6 @@ chosen { ...@@ -61,8 +61,6 @@ chosen {
gpio-keys { gpio-keys {
compatible = "gpio-keys-polled"; compatible = "gpio-keys-polled";
pinctrl-names = "default";
pinctrl-0 = <&key_pins_inet9f>;
poll-interval = <20>; poll-interval = <20>;
left-joystick-left { left-joystick-left {
...@@ -70,7 +68,7 @@ left-joystick-left { ...@@ -70,7 +68,7 @@ left-joystick-left {
linux,code = <ABS_X>; linux,code = <ABS_X>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <0xffffffff>; /* -1 */ linux,input-value = <0xffffffff>; /* -1 */
gpios = <&pio 0 6 GPIO_ACTIVE_LOW>; /* PA6 */ gpios = <&pio 0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA6 */
}; };
left-joystick-right { left-joystick-right {
...@@ -78,7 +76,7 @@ left-joystick-right { ...@@ -78,7 +76,7 @@ left-joystick-right {
linux,code = <ABS_X>; linux,code = <ABS_X>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <1>; linux,input-value = <1>;
gpios = <&pio 0 5 GPIO_ACTIVE_LOW>; /* PA5 */ gpios = <&pio 0 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA5 */
}; };
left-joystick-up { left-joystick-up {
...@@ -86,7 +84,7 @@ left-joystick-up { ...@@ -86,7 +84,7 @@ left-joystick-up {
linux,code = <ABS_Y>; linux,code = <ABS_Y>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <0xffffffff>; /* -1 */ linux,input-value = <0xffffffff>; /* -1 */
gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ gpios = <&pio 0 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA8 */
}; };
left-joystick-down { left-joystick-down {
...@@ -94,7 +92,7 @@ left-joystick-down { ...@@ -94,7 +92,7 @@ left-joystick-down {
linux,code = <ABS_Y>; linux,code = <ABS_Y>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <1>; linux,input-value = <1>;
gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */ gpios = <&pio 0 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA9 */
}; };
right-joystick-left { right-joystick-left {
...@@ -102,7 +100,7 @@ right-joystick-left { ...@@ -102,7 +100,7 @@ right-joystick-left {
linux,code = <ABS_Z>; linux,code = <ABS_Z>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <0xffffffff>; /* -1 */ linux,input-value = <0xffffffff>; /* -1 */
gpios = <&pio 0 1 GPIO_ACTIVE_LOW>; /* PA1 */ gpios = <&pio 0 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA1 */
}; };
right-joystick-right { right-joystick-right {
...@@ -110,7 +108,7 @@ right-joystick-right { ...@@ -110,7 +108,7 @@ right-joystick-right {
linux,code = <ABS_Z>; linux,code = <ABS_Z>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <1>; linux,input-value = <1>;
gpios = <&pio 0 0 GPIO_ACTIVE_LOW>; /* PA0 */ gpios = <&pio 0 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA0 */
}; };
right-joystick-up { right-joystick-up {
...@@ -118,7 +116,7 @@ right-joystick-up { ...@@ -118,7 +116,7 @@ right-joystick-up {
linux,code = <ABS_RZ>; linux,code = <ABS_RZ>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <0xffffffff>; /* -1 */ linux,input-value = <0xffffffff>; /* -1 */
gpios = <&pio 0 3 GPIO_ACTIVE_LOW>; /* PA3 */ gpios = <&pio 0 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA3 */
}; };
right-joystick-down { right-joystick-down {
...@@ -126,7 +124,7 @@ right-joystick-down { ...@@ -126,7 +124,7 @@ right-joystick-down {
linux,code = <ABS_RZ>; linux,code = <ABS_RZ>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <1>; linux,input-value = <1>;
gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */ gpios = <&pio 0 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA4 */
}; };
dpad-left { dpad-left {
...@@ -134,7 +132,7 @@ dpad-left { ...@@ -134,7 +132,7 @@ dpad-left {
linux,code = <ABS_HAT0X>; linux,code = <ABS_HAT0X>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <0xffffffff>; /* -1 */ linux,input-value = <0xffffffff>; /* -1 */
gpios = <&pio 7 23 GPIO_ACTIVE_LOW>; /* PH23 */ gpios = <&pio 7 23 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH23 */
}; };
dpad-right { dpad-right {
...@@ -142,7 +140,7 @@ dpad-right { ...@@ -142,7 +140,7 @@ dpad-right {
linux,code = <ABS_HAT0X>; linux,code = <ABS_HAT0X>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <1>; linux,input-value = <1>;
gpios = <&pio 7 24 GPIO_ACTIVE_LOW>; /* PH24 */ gpios = <&pio 7 24 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH24 */
}; };
dpad-up { dpad-up {
...@@ -150,7 +148,7 @@ dpad-up { ...@@ -150,7 +148,7 @@ dpad-up {
linux,code = <ABS_HAT0Y>; linux,code = <ABS_HAT0Y>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <0xffffffff>; /* -1 */ linux,input-value = <0xffffffff>; /* -1 */
gpios = <&pio 7 25 GPIO_ACTIVE_LOW>; /* PH25 */ gpios = <&pio 7 25 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH25 */
}; };
dpad-down { dpad-down {
...@@ -158,55 +156,55 @@ dpad-down { ...@@ -158,55 +156,55 @@ dpad-down {
linux,code = <ABS_HAT0Y>; linux,code = <ABS_HAT0Y>;
linux,input-type = <EV_ABS>; linux,input-type = <EV_ABS>;
linux,input-value = <1>; linux,input-value = <1>;
gpios = <&pio 7 26 GPIO_ACTIVE_LOW>; /* PH26 */ gpios = <&pio 7 26 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH26 */
}; };
x { x {
label = "Button X"; label = "Button X";
linux,code = <BTN_X>; linux,code = <BTN_X>;
gpios = <&pio 0 16 GPIO_ACTIVE_LOW>; /* PA16 */ gpios = <&pio 0 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA16 */
}; };
y { y {
label = "Button Y"; label = "Button Y";
linux,code = <BTN_Y>; linux,code = <BTN_Y>;
gpios = <&pio 0 14 GPIO_ACTIVE_LOW>; /* PA14 */ gpios = <&pio 0 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA14 */
}; };
a { a {
label = "Button A"; label = "Button A";
linux,code = <BTN_A>; linux,code = <BTN_A>;
gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */ gpios = <&pio 0 17 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA17 */
}; };
b { b {
label = "Button B"; label = "Button B";
linux,code = <BTN_B>; linux,code = <BTN_B>;
gpios = <&pio 0 15 GPIO_ACTIVE_LOW>; /* PA15 */ gpios = <&pio 0 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA15 */
}; };
select { select {
label = "Select Button"; label = "Select Button";
linux,code = <BTN_SELECT>; linux,code = <BTN_SELECT>;
gpios = <&pio 0 11 GPIO_ACTIVE_LOW>; /* PA11 */ gpios = <&pio 0 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA11 */
}; };
start { start {
label = "Start Button"; label = "Start Button";
linux,code = <BTN_START>; linux,code = <BTN_START>;
gpios = <&pio 0 12 GPIO_ACTIVE_LOW>; /* PA12 */ gpios = <&pio 0 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA12 */
}; };
top-left { top-left {
label = "Top Left Button"; label = "Top Left Button";
linux,code = <BTN_TL>; linux,code = <BTN_TL>;
gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ gpios = <&pio 7 22 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH22 */
}; };
top-right { top-right {
label = "Top Right Button"; label = "Top Right Button";
linux,code = <BTN_TR>; linux,code = <BTN_TR>;
gpios = <&pio 0 13 GPIO_ACTIVE_LOW>; /* PA13 */ gpios = <&pio 0 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA13 */
}; };
}; };
}; };
...@@ -306,30 +304,6 @@ &otg_sram { ...@@ -306,30 +304,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
key_pins_inet9f: key-pins {
pins = "PA0", "PA1", "PA3", "PA4",
"PA5", "PA6", "PA8", "PA9",
"PA11", "PA12", "PA13",
"PA14", "PA15", "PA16", "PA17",
"PH22", "PH23", "PH24", "PH25", "PH26";
function = "gpio_in";
bias-pull-up;
};
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -375,10 +349,8 @@ &usb_otg { ...@@ -375,10 +349,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun4i-a10-marsboard.dts
View file @ a107bd2b
...@@ -148,14 +148,6 @@ &otg_sram { ...@@ -148,14 +148,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
status = "okay"; status = "okay";
}; };
...@@ -183,9 +175,7 @@ &usb_otg { ...@@ -183,9 +175,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
View file @ a107bd2b
...@@ -186,18 +186,6 @@ led_pins_olinuxinolime: led-pin { ...@@ -186,18 +186,6 @@ led_pins_olinuxinolime: led-pin {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
}; };
&reg_ahci_5v { &reg_ahci_5v {
...@@ -229,10 +217,8 @@ &usb_otg { ...@@ -229,10 +217,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpio = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
......
arch/arm/boot/dts/sun4i-a10-pcduino.dts
View file @ a107bd2b
...@@ -154,14 +154,6 @@ &otg_sram { ...@@ -154,14 +154,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
#include "axp209.dtsi" #include "axp209.dtsi"
&reg_dcdc2 { &reg_dcdc2 {
...@@ -201,9 +193,7 @@ &usb_otg { ...@@ -201,9 +193,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb1_vbus-supply = <&reg_vcc5v0>; /* USB1 VBUS is always on */ usb1_vbus-supply = <&reg_vcc5v0>; /* USB1 VBUS is always on */
usb2_vbus-supply = <&reg_vcc5v0>; /* USB2 VBUS is always on */ usb2_vbus-supply = <&reg_vcc5v0>; /* USB2 VBUS is always on */
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
View file @ a107bd2b
...@@ -146,20 +146,6 @@ &otg_sram { ...@@ -146,20 +146,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pin>; pinctrl-0 = <&pwm0_pin>;
...@@ -212,9 +198,8 @@ &usb_otg { ...@@ -212,9 +198,8 @@ &usb_otg {
&usbphy { &usbphy {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
View file @ a107bd2b
...@@ -119,12 +119,6 @@ &otg_sram { ...@@ -119,12 +119,6 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG12";
function = "gpio_in";
bias-pull-up;
};
led_pins_t004: led-pin { led_pins_t004: led-pin {
pins = "PB2"; pins = "PB2";
function = "gpio_out"; function = "gpio_out";
...@@ -149,9 +143,7 @@ &usb_otg { ...@@ -149,9 +143,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 6 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG12 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
status = "okay"; status = "okay";
}; };
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
View file @ a107bd2b
...@@ -218,12 +218,6 @@ led_pins_olinuxino: led-pin { ...@@ -218,12 +218,6 @@ led_pins_olinuxino: led-pin {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG12";
function = "gpio_in";
bias-pull-up;
};
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
...@@ -271,9 +265,7 @@ &usb_otg { ...@@ -271,9 +265,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 6 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG12 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
View file @ a107bd2b
...@@ -127,20 +127,6 @@ &otg_sram { ...@@ -127,20 +127,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-down;
};
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pin>; pinctrl-0 = <&pwm0_pin>;
...@@ -195,10 +181,8 @@ &usb_otg { ...@@ -195,10 +181,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_ldo3>; usb1_vbus-supply = <&reg_ldo3>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
View file @ a107bd2b
...@@ -124,14 +124,6 @@ &otg_sram { ...@@ -124,14 +124,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
};
};
#include "axp209.dtsi" #include "axp209.dtsi"
&reg_dcdc2 { &reg_dcdc2 {
...@@ -182,9 +174,7 @@ &usb_otg { ...@@ -182,9 +174,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_ldo3>; usb1_vbus-supply = <&reg_ldo3>;
......
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
View file @ a107bd2b
...@@ -109,18 +109,6 @@ led_pins_olinuxinom: led-pin { ...@@ -109,18 +109,6 @@ led_pins_olinuxinom: led-pin {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-down;
};
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
...@@ -145,10 +133,8 @@ &usb_otg { ...@@ -145,10 +133,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
View file @ a107bd2b
...@@ -202,18 +202,6 @@ led_pins_olinuxino: led-pin { ...@@ -202,18 +202,6 @@ led_pins_olinuxino: led-pin {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-down;
};
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
...@@ -251,10 +239,8 @@ &usb_otg { ...@@ -251,10 +239,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
View file @ a107bd2b
...@@ -61,10 +61,8 @@ chosen { ...@@ -61,10 +61,8 @@ chosen {
i2c_lcd: i2c { i2c_lcd: i2c {
/* The lcd panel i2c interface is hooked up via gpios */ /* The lcd panel i2c interface is hooked up via gpios */
compatible = "i2c-gpio"; compatible = "i2c-gpio";
pinctrl-names = "default"; sda-gpios = <&pio 6 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG12 */
pinctrl-0 = <&i2c_lcd_pins>; scl-gpios = <&pio 6 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG10 */
sda-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
scl-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */
i2c-gpio,delay-us = <5>; i2c-gpio,delay-us = <5>;
}; };
}; };
...@@ -94,14 +92,6 @@ mmccard: mmccard@0 { ...@@ -94,14 +92,6 @@ mmccard: mmccard@0 {
}; };
}; };
&pio {
i2c_lcd_pins: i2c-lcd-pin {
pins = "PG10", "PG12";
function = "gpio_out";
bias-pull-up;
};
};
&reg_usb0_vbus { &reg_usb0_vbus {
gpio = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ gpio = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
}; };
......
arch/arm/boot/dts/sun5i-r8-chip.dts
View file @ a107bd2b
...@@ -84,9 +84,7 @@ mmc0_pwrseq: mmc0_pwrseq { ...@@ -84,9 +84,7 @@ mmc0_pwrseq: mmc0_pwrseq {
onewire { onewire {
compatible = "w1-gpio"; compatible = "w1-gpio";
gpios = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */ gpios = <&pio 3 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PD2 */
pinctrl-names = "default";
pinctrl-0 = <&chip_w1_pin>;
}; };
}; };
...@@ -173,14 +171,6 @@ &otg_sram { ...@@ -173,14 +171,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
chip_w1_pin: chip-w1-pin {
pins = "PD2";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1400000>; regulator-max-microvolt = <1400000>;
......
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
View file @ a107bd2b
...@@ -132,20 +132,6 @@ &otg_sram { ...@@ -132,20 +132,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PG1";
function = "gpio_in";
bias-pull-down;
};
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PG2";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -198,10 +184,8 @@ &usb_power_supply { ...@@ -198,10 +184,8 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_ldo3>; usb1_vbus-supply = <&reg_ldo3>;
......
arch/arm/boot/dts/sun6i-a31-colombus.dts
View file @ a107bd2b
...@@ -63,10 +63,8 @@ chosen { ...@@ -63,10 +63,8 @@ chosen {
i2c_lcd: i2c { i2c_lcd: i2c {
/* The lcd panel i2c interface is hooked up via gpios */ /* The lcd panel i2c interface is hooked up via gpios */
compatible = "i2c-gpio"; compatible = "i2c-gpio";
pinctrl-names = "default"; sda-gpios = <&pio 0 23 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA23 */
pinctrl-0 = <&i2c_lcd_pins>; scl-gpios = <&pio 0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA24 */
sda-gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>; /* PA23 */
scl-gpios = <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24 */
i2c-gpio,delay-us = <5>; i2c-gpio,delay-us = <5>;
}; };
}; };
...@@ -113,14 +111,6 @@ &mmc0 { ...@@ -113,14 +111,6 @@ &mmc0 {
status = "okay"; status = "okay";
}; };
&pio {
i2c_lcd_pins: i2c-lcd-pins {
pins = "PA23", "PA24";
function = "gpio_out";
bias-pull-up;
};
};
&reg_usb2_vbus { &reg_usb2_vbus {
gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
View file @ a107bd2b
...@@ -73,14 +73,6 @@ &mmc0 { ...@@ -73,14 +73,6 @@ &mmc0 {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PA15";
function = "gpio_in";
bias-pull-up;
};
};
&p2wi { &p2wi {
status = "okay"; status = "okay";
...@@ -173,9 +165,7 @@ &usb_power_supply { ...@@ -173,9 +165,7 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 0 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA15 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_drivevbus>; usb0_vbus-supply = <&reg_drivevbus>;
usb1_vbus-supply = <&reg_dldo1>; usb1_vbus-supply = <&reg_dldo1>;
......
arch/arm/boot/dts/sun7i-a20-bananapi.dts
View file @ a107bd2b
...@@ -246,12 +246,6 @@ &pio { ...@@ -246,12 +246,6 @@ &pio {
"SPI-MISO", "SPI-CE1", "", "SPI-MISO", "SPI-CE1", "",
"IO-6", "IO-3", "IO-2", "IO-0", "", "", "", "", "IO-6", "IO-3", "IO-2", "IO-0", "", "", "", "",
"", "", "", "", "", "", "", ""; "", "", "", "", "", "", "", "";
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
...@@ -329,9 +323,7 @@ &usb_power_supply { ...@@ -329,9 +323,7 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
......
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View file @ a107bd2b
...@@ -173,14 +173,6 @@ &otg_sram { ...@@ -173,14 +173,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_ahci_5v { &reg_ahci_5v {
status = "okay"; status = "okay";
}; };
...@@ -236,9 +228,7 @@ &usb_otg { ...@@ -236,9 +228,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
View file @ a107bd2b
...@@ -229,14 +229,6 @@ &otg_sram { ...@@ -229,14 +229,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
#include "axp209.dtsi" #include "axp209.dtsi"
&ac_power_supply { &ac_power_supply {
...@@ -322,9 +314,7 @@ &usb_power_supply { ...@@ -322,9 +314,7 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
View file @ a107bd2b
...@@ -174,18 +174,6 @@ led_pins_olinuxinolime: led-pins { ...@@ -174,18 +174,6 @@ led_pins_olinuxinolime: led-pins {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
}; };
&reg_ahci_5v { &reg_ahci_5v {
...@@ -217,10 +205,8 @@ &usb_otg { ...@@ -217,10 +205,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
View file @ a107bd2b
...@@ -185,18 +185,6 @@ led_pins_olinuxinolime: led-pins { ...@@ -185,18 +185,6 @@ led_pins_olinuxinolime: led-pins {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
}; };
&reg_ahci_5v { &reg_ahci_5v {
...@@ -273,10 +261,8 @@ &usb_otg { ...@@ -273,10 +261,8 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
View file @ a107bd2b
...@@ -252,18 +252,6 @@ led_pins_olinuxino: led-pins { ...@@ -252,18 +252,6 @@ led_pins_olinuxino: led-pins {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
...@@ -355,10 +343,8 @@ &usb_power_supply { ...@@ -355,10 +343,8 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
......
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
View file @ a107bd2b
...@@ -176,14 +176,6 @@ &otg_sram { ...@@ -176,14 +176,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -239,9 +231,7 @@ &usb_power_supply { ...@@ -239,9 +231,7 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
......
arch/arm/boot/dts/sun7i-a20-orangepi.dts
View file @ a107bd2b
...@@ -135,14 +135,6 @@ &otg_sram { ...@@ -135,14 +135,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -198,9 +190,7 @@ &usb_power_supply { ...@@ -198,9 +190,7 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
......
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
View file @ a107bd2b
...@@ -168,14 +168,6 @@ &otg_sram { ...@@ -168,14 +168,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_ahci_5v { &reg_ahci_5v {
gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
status = "okay"; status = "okay";
...@@ -226,9 +218,7 @@ &usb_otg { ...@@ -226,9 +218,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb1_vbus>; usb2_vbus-supply = <&reg_usb1_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View file @ a107bd2b
...@@ -168,14 +168,6 @@ &otg_sram { ...@@ -168,14 +168,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_ahci_5v { &reg_ahci_5v {
gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
...@@ -226,9 +218,7 @@ &usb_otg { ...@@ -226,9 +218,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>; usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
View file @ a107bd2b
...@@ -156,14 +156,6 @@ &otg_sram { ...@@ -156,14 +156,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pin>; pinctrl-0 = <&pwm0_pin>;
...@@ -223,9 +215,7 @@ &usb_power_supply { ...@@ -223,9 +215,7 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
......
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
View file @ a107bd2b
...@@ -145,14 +145,6 @@ &otg_sram { ...@@ -145,14 +145,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -206,9 +198,7 @@ &usb_power_supply { ...@@ -206,9 +198,7 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
......
arch/arm/boot/dts/sun8i-r16-parrot.dts
View file @ a107bd2b
...@@ -158,14 +158,6 @@ &ohci0 { ...@@ -158,14 +158,6 @@ &ohci0 {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_det: usb0-id-detect-pin {
pins = "PD10";
function = "gpio_in";
bias-pull-up;
};
};
&r_rsb { &r_rsb {
status = "okay"; status = "okay";
...@@ -314,10 +306,8 @@ &usb_power_supply { ...@@ -314,10 +306,8 @@ &usb_power_supply {
&usbphy { &usbphy {
status = "okay"; status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_det>;
usb0_vbus-supply = <&reg_drivevbus>; usb0_vbus-supply = <&reg_drivevbus>;
usb0_id_det-gpios = <&pio 3 10 GPIO_ACTIVE_HIGH>; /* PD10 */ usb0_id_det-gpios = <&pio 3 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PD10 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb1_vbus-supply = <&reg_usb1_vbus>; usb1_vbus-supply = <&reg_usb1_vbus>;
}; };
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
View file @ a107bd2b
...@@ -86,14 +86,6 @@ &mmc0 { ...@@ -86,14 +86,6 @@ &mmc0 {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH8";
function = "gpio_in";
bias-pull-up;
};
};
&r_rsb { &r_rsb {
status = "okay"; status = "okay";
...@@ -224,9 +216,7 @@ &usb_power_supply { ...@@ -224,9 +216,7 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default"; usb0_id_det-gpios = <&pio 7 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH8 */
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_drivevbus>; usb0_vbus-supply = <&reg_drivevbus>;
status = "okay"; status = "okay";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7