Unverified Commit 2c515b0d authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: sunxi: Fix the USB PHY ID detect GPIO properties 



While the USB PHY Device Tree mandates that the name of the ID detect pin
should be usb0_id_det-gpios, a significant number of device tree use
usb0_id_det-gpio instead.

This was functional because the GPIO framework falls back to the gpio
suffix that is legacy, but we should fix this.

Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent 0c64f75d

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
&usbphy {

	pinctrl-names = "default";

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

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

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

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

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

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

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ 
&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>;

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

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

	usb1_vbus-supply = <&reg_usb1_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

	status = "okay";

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

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ 
&usbphy {

	pinctrl-names = "default";

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

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

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

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

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 
&usbphy {

	pinctrl-names = "default";

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

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

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

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

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb2_vbus-supply = <&reg_usb2_vbus>;

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

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ 
&usbphy {

	pinctrl-names = "default";

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

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

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

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

	usb0_vbus-supply = <&reg_usb0_vbus>;

	usb1_vbus-supply = <&reg_usb1_vbus>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE