[U-Boot] [PATCH 19/23] ARM: rmobile: salvator-x: Add USB support

[Marek Vasut]

Add support for the EHCI USB.

Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx at renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 board/renesas/salvator-x/salvator-x.c | 12 ++++++++++++
 configs/salvator-x_defconfig          |  6 ++++++
 include/configs/salvator-x.h          |  7 +++++++
 3 files changed, 25 insertions(+)

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index acc541df0c..44e4006f5c 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -107,6 +107,9 @@ int board_init(void)
 
 	mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112);
 
+	/* USB1 pull-up */
+	setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);
+
 #ifdef CONFIG_RAVB
 	/* EtherAVB Enable */
 	/* GPSR2 */
@@ -131,6 +134,15 @@ int board_init(void)
 	/* IPSR3 */
 	gpio_request(GPIO_FN_AVB_AVTP_CAPTURE_B, NULL);
 
+	/* USB2_OVC */
+	gpio_request(GPIO_GP_6_15, NULL);
+	gpio_direction_input(GPIO_GP_6_15);
+
+	/* USB2_PWEN */
+	gpio_request(GPIO_GP_6_14, NULL);
+	gpio_direction_output(GPIO_GP_6_14, 1);
+	gpio_set_value(GPIO_GP_6_14, 1);
+
 	/* AVB_PHY_RST */
 	gpio_request(GPIO_GP_2_10, NULL);
 	gpio_direction_output(GPIO_GP_2_10, 0);
diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index 3738fe4536..60e0b720bb 100644
--- a/configs/salvator-x_defconfig
+++ b/configs/salvator-x_defconfig
@@ -17,6 +17,12 @@ CONFIG_CMD_NFS=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_DHCP=y
+CONFIG_CMD_USB=y
+CONFIG_USB=y
+CONFIG_USB_HOST=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_EHCI_RCAR_GEN3=y
 CONFIG_DOS_PARTITION=y
 CONFIG_MMC=y
 CONFIG_GENERIC_MMC=y
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 0e5c130b13..4ac9328e1b 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -62,6 +62,13 @@
 
 #define CONFIG_SYS_I2C_POWERIC_ADDR	0x30
 
+/* USB */
+#ifdef CONFIG_R8A7795
+#define CONFIG_USB_MAX_CONTROLLER_COUNT	3
+#else
+#define CONFIG_USB_MAX_CONTROLLER_COUNT	2
+#endif
+
 /* SDHI */
 #define CONFIG_SH_SDHI_FREQ		200000000
 
-- 
2.11.0