[U-Boot] [PATCH 05/10] board: tbs2910: Convert usb to driver model

Soeren Moch
2019-03-01T12:10:56Z

So we don't need to duplicate settings from the device tree in the board file.

Signed-off-by: Soeren Moch <smoch@web.de>
---
Cc: Stefano Babic <sbabic@denx.de>
Cc: u-boot at lists.denx.de
---
board/tbs/tbs2910/tbs2910.c | 10 ----------
configs/tbs2910_defconfig | 2 ++
include/configs/tbs2910.h | 1 -
3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index 175dd88a69..20c93778e1 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -418,12 +418,6 @@ static const struct boot_mode board_boot_modes[] = {
};
#endif

-#ifdef CONFIG_USB_EHCI_MX6
-static iomux_v3_cfg_t const usb_otg_pads[] = {
- MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-#endif
-
int board_init(void)
{
/* address of boot parameters */
@@ -442,10 +436,6 @@ int board_init(void)
#endif
#ifdef CONFIG_CMD_BMODE
add_board_boot_modes(board_boot_modes);
-#endif
-#ifdef CONFIG_USB_EHCI_MX6
- imx_iomux_v3_setup_multiple_pads(
- usb_otg_pads, ARRAY_SIZE(usb_otg_pads));
#endif
return 0;
}
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 717cabfa3b..395275c6dd 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
CONFIG_DWC_AHSATA=y
CONFIG_DM_GPIO=y
+CONFIG_DM_KEYBOARD=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y
@@ -51,6 +52,7 @@ CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_DM_THERMAL=y
CONFIG_USB=y
+CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index b06c90939c..93f75d72f3 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -81,7 +81,6 @@

/* USB */
#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#ifdef CONFIG_CMD_USB_MASS_STORAGE
--
2.17.1