diff mbox series

[U-Boot,2/4] imx: cx9020: migrate cx9020 to CONFIG_DM_USB

Message ID 20191023054043.22984-3-linux-kernel-dev@beckhoff.com
State Accepted
Commit ba1444eab6c51550b2c992fc228d5f29774366bf
Delegated to: Stefano Babic
Headers show
Series Migrate cx9020 to DM_ETH, DM_USB and distro boot | expand

Commit Message

linux-kernel-dev Oct. 23, 2019, 5:40 a.m. UTC 
From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>

Note: gpio7_8 was never used for usb power regulator so we remove it here

Acked-by: Patrick Bruenn <p.bruenn@beckhoff.com>
Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
---

 arch/arm/dts/imx53-cx9020.dts          | 11 ++++++++++-
 board/beckhoff/mx53cx9020/mx53cx9020.c | 10 ----------
 configs/mx53cx9020_defconfig           |  6 ++++++
 3 files changed, 16 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/dts/imx53-cx9020.dts b/arch/arm/dts/imx53-cx9020.dts
index 2b7f7288088..e08850999b1 100644
--- a/arch/arm/dts/imx53-cx9020.dts
+++ b/arch/arm/dts/imx53-cx9020.dts
@@ -36,7 +36,6 @@ 
 				MX53_PAD_GPIO_1__GPIO1_1          0x80000000
 				MX53_PAD_GPIO_4__GPIO1_4          0x80000000
 				MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
-				MX53_PAD_PATA_DA_2__GPIO7_8	  0x80000000
 				MX53_PAD_GPIO_16__GPIO7_11        0x80000000
 
 				MX53_PAD_EIM_OE__EMI_WEIM_OE            0x80000000
@@ -220,3 +219,13 @@ 
 		full-duplex;
 	};
 };
+
+&usbh1 {
+	phy_type = "utmi";
+	status = "okay";
+};
+
+&usbotg {
+	dr_mode = "host";
+	status = "okay";
+};
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index 9450d925f6f..caffd5c9ee8 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -127,16 +127,6 @@  static void setup_gpio_leds(void)
 	gpio_direction_output(GPIO_LED_PWR_G, 0);
 }
 
-#ifdef CONFIG_USB_EHCI_MX5
-int board_ehci_hcd_init(int port)
-{
-	/* request VBUS power enable pin, GPIO7_8 */
-	gpio_direction_output(IMX_GPIO_NR(7, 8), 1);
-	return 0;
-}
-#endif
-
-
 static int power_init(void)
 {
 	/* nothing to do on CX9020 */
diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
index 17c44bd070a..6087ed81ec9 100644
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -19,7 +19,13 @@  CONFIG_CMD_PXE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_USB=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_MX5=y
+CONFIG_USB_STORAGE=y
+CONFIG_DM_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx53-cx9020"
 CONFIG_ENV_IS_IN_MMC=y