Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9908c17 authored by Russell King's avatar Russell King Committed by Shawn Guo
Browse files

ARM: dts: hummingboard/cubox-i: add USB OC pinctrl configuration 



Hummingboard has no over current hardware, so disable the over current
detection for both ports.

Cubox-i has over current hardware, so appropriately configure this.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent 090727b8

arch/arm/boot/dts/imx6dl-hummingboard.dts

+2 −0
Original line number Diff line number Diff line
@@ -181,11 +181,13 @@ 
};



&usbh1 {

	disable-over-current;

	vbus-supply = <&reg_usbh1_vbus>;

	status = "okay";

};



&usbotg {

	disable-over-current;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;

	vbus-supply = <&reg_usbotg_vbus>;

arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

+13 −4
Original line number Diff line number Diff line
@@ -130,16 +130,23 @@ 
			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;

		};



		pinctrl_cubox_i_usbh1: cubox-i-usbh1 {

			fsl,pins = <MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0>;

		};



		pinctrl_cubox_i_usbh1_vbus: cubox-i-usbh1-vbus {

			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;

		};



		pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {

		pinctrl_cubox_i_usbotg: cubox-i-usbotg {

			/*

			 * The Cubox-i pulls this low, but as it's pointless

			 * The Cubox-i pulls ID low, but as it's pointless

			 * leaving it as a pull-up, even if it is just 10uA.

			 */

			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;

			fsl,pins = <

				MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059

				MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x1b0b0

			>;

		};



		pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {
@@ -173,13 +180,15 @@ 
};



&usbh1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cubox_i_usbh1>;

	vbus-supply = <&reg_usbh1_vbus>;

	status = "okay";

};



&usbotg {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;

	pinctrl-0 = <&pinctrl_cubox_i_usbotg>;

	vbus-supply = <&reg_usbotg_vbus>;

	status = "okay";

};