Unverified Commit a107bd2b authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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

arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts

+2 −18
Original line number Diff line number Diff line
@@ -131,20 +131,6 @@ 
	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 {

	status = "okay";

};
@@ -165,10 +151,8 @@ 
};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

	usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

arch/arm/boot/dts/sun4i-a10-cubieboard.dts

+1 −9
Original line number Diff line number Diff line
@@ -184,12 +184,6 @@ 
		function = "gpio_out";

		drive-strength = <20>;

	};



	usb0_id_detect_pin: usb0-id-detect-pin {

		pins = "PH4";

		function = "gpio_in";

		bias-pull-up;

	};

};



&reg_ahci_5v {
@@ -254,9 +248,7 @@ 
};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>;

	usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts

+2 −18
Original line number Diff line number Diff line
@@ -158,20 +158,6 @@ 
	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 {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pin>;
@@ -223,10 +209,8 @@ 
};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

	usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts

+2 −18
Original line number Diff line number Diff line
@@ -86,20 +86,6 @@ 
	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 {

	status = "okay";

};
@@ -121,10 +107,8 @@ 
};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

	usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

arch/arm/boot/dts/sun4i-a10-inet1.dts

+2 −18
Original line number Diff line number Diff line
@@ -164,20 +164,6 @@ 
	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 {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pin>;
@@ -233,10 +219,8 @@ 
};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

	usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */

	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */

	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE