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

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

ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level 



The configuration of the USB OTG is a platform configuration decision,
not a microsom decision.  Move this configuration out to the platform
level files.

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

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

+10 −0
Original line number Diff line number Diff line
@@ -143,6 +143,14 @@ 
			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;

		};



		pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id {

			/*

			 * Similar to pinctrl_usbotg_2, but we want it

			 * pulled down for a fixed host connection.

			 */

			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;

		};



		pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {

			fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;

		};
@@ -178,6 +186,8 @@ 
};



&usbotg {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;

	vbus-supply = <&reg_usbotg_vbus>;

	status = "okay";

};

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

+10 −0
Original line number Diff line number Diff line
@@ -134,6 +134,14 @@ 
			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;

		};



		pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {

			/*

			 * The Cubox-i pulls this 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>;

		};



		pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {

			fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x4001b0b0>;

		};
@@ -170,6 +178,8 @@ 
};



&usbotg {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;

	vbus-supply = <&reg_usbotg_vbus>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-microsom.dtsi

+0 −13
Original line number Diff line number Diff line
@@ -10,14 +10,6 @@ 
				MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA	0x1b0b1

			>;

		};



		pinctrl_microsom_usbotg: microsom-usbotg {

			/*

			 * Similar to pinctrl_usbotg_2, but we want it

			 * pulled down for a fixed host connection.

			 */

			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;

		};

	};

};
@@ -26,8 +18,3 @@ 
	pinctrl-0 = <&pinctrl_microsom_uart1>;

	status = "okay";

};
 


&usbotg {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_microsom_usbotg>;

};