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

Commit 6022232b authored by Peter Chen's avatar Peter Chen Committed by Shawn Guo
Browse files

ARM: imx: mx6sl-evk: Enable USB function 



Enable USB function for OTG 1 and OTG 2 at mx6sololite evk.
Besides, fix the wrong interrupt number for OTG2 and host 1.

Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent e03d10f9

arch/arm/boot/dts/imx6sl-evk.dts

+39 −0
Original line number Diff line number Diff line
@@ -17,6 +17,28 @@ 
	memory {

		reg = <0x80000000 0x40000000>;

	};



	regulators {

		compatible = "simple-bus";



		reg_usb_otg1_vbus: usb_otg1_vbus {

			compatible = "regulator-fixed";

			regulator-name = "usb_otg1_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio4 0 0>;

			enable-active-high;

		};



		reg_usb_otg2_vbus: usb_otg2_vbus {

			compatible = "regulator-fixed";

			regulator-name = "usb_otg2_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio4 2 0>;

			enable-active-high;

		};

	};

};



&fec {
@@ -38,6 +60,8 @@ 
				MX6SL_PAD_SD2_DAT7__GPIO5_IO00    0x17059

				MX6SL_PAD_SD2_DAT6__GPIO4_IO29    0x17059

				MX6SL_PAD_REF_CLK_32K__GPIO3_IO22 0x17059

				MX6SL_PAD_KEY_COL4__GPIO4_IO00	0x80000000

				MX6SL_PAD_KEY_COL5__GPIO4_IO02	0x80000000

			>;

		};

	};
@@ -49,6 +73,21 @@ 
	status = "okay";

};



&usbotg1 {

	vbus-supply = <&reg_usb_otg1_vbus>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg1_1>;

	disable-over-current;

	status = "okay";

};



&usbotg2 {

	vbus-supply = <&reg_usb_otg2_vbus>;

	dr_mode = "host";

	disable-over-current;

	status = "okay";

};



&usdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc1_1>;

arch/arm/boot/dts/imx6sl.dtsi

+60 −2
Original line number Diff line number Diff line
@@ -562,6 +562,64 @@ 
					};

				};



				usbotg1 {

					pinctrl_usbotg1_1: usbotg1grp-1 {

						fsl,pins = <

							MX6SL_PAD_EPDC_PWRCOM__USB_OTG1_ID 0x17059

						>;

					};



					pinctrl_usbotg1_2: usbotg1grp-2 {

						fsl,pins = <

							MX6SL_PAD_FEC_RXD0__USB_OTG1_ID 0x17059

						>;

					};



					pinctrl_usbotg1_3: usbotg1grp-3 {

						fsl,pins = <

							MX6SL_PAD_LCD_DAT1__USB_OTG1_ID 0x17059

						>;

					};



					pinctrl_usbotg1_4: usbotg1grp-4 {

						fsl,pins = <

							MX6SL_PAD_REF_CLK_32K__USB_OTG1_ID 0x17059

						>;

					};



					pinctrl_usbotg1_5: usbotg1grp-5 {

						fsl,pins = <

							MX6SL_PAD_SD3_DAT0__USB_OTG1_ID 0x17059

						>;

					};

				};



				usbotg2 {

					pinctrl_usbotg2_1: usbotg2grp-1 {

						fsl,pins = <

							MX6SL_PAD_ECSPI1_SCLK__USB_OTG2_OC 0x17059

						>;

					};



					pinctrl_usbotg2_2: usbotg2grp-2 {

						fsl,pins = <

							MX6SL_PAD_ECSPI2_SCLK__USB_OTG2_OC 0x17059

						>;

					};



					pinctrl_usbotg2_3: usbotg2grp-3 {

						fsl,pins = <

							MX6SL_PAD_KEY_ROW5__USB_OTG2_OC 0x17059

						>;

					};



					pinctrl_usbotg2_4: usbotg2grp-4 {

						fsl,pins = <

							MX6SL_PAD_SD3_DAT2__USB_OTG2_OC 0x17059

						>;

					};

				};



				usdhc1 {

					pinctrl_usdhc1_1: usdhc1grp-1 {

						fsl,pins = <
@@ -669,7 +727,7 @@ 
			usbotg2: usb@02184200 {

				compatible = "fsl,imx6sl-usb", "fsl,imx27-usb";

				reg = <0x02184200 0x200>;

				interrupts = <0 40 0x04>;

				interrupts = <0 42 0x04>;

				clocks = <&clks IMX6SL_CLK_USBOH3>;

				fsl,usbphy = <&usbphy2>;

				fsl,usbmisc = <&usbmisc 1>;
@@ -679,7 +737,7 @@ 
			usbh: usb@02184400 {

				compatible = "fsl,imx6sl-usb", "fsl,imx27-usb";

				reg = <0x02184400 0x200>;

				interrupts = <0 42 0x04>;

				interrupts = <0 40 0x04>;

				clocks = <&clks IMX6SL_CLK_USBOH3>;

				fsl,usbmisc = <&usbmisc 2>;

				status = "disabled";