usb: Kconfig: Add Kconfigs entry USB_EHCI_ZYNQ

Add Kconfig entry config option for USB_EHCI_ZYNQ and update the same to enable for all zynq boards which supports USB Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
8 years ago · 2cdc778b62
parent 3bac8303e4
commit 2cdc778b62
13 changed files with 20 additions and 11 deletions
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@ -37,6 +37,8 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@ -27,6 +27,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_ZYNQ_SDHCI=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@ -42,6 +42,8 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
 CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@ -38,6 +38,8 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@ -37,6 +37,8 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@ -40,6 +40,8 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
 CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@ -85,6 +85,13 @@ config USB_EHCI_MSM
 	  This driver supports combination of Chipidea USB controller
 	  and Synapsys USB PHY in host mode only.

+config USB_EHCI_ZYNQ
+	bool "Support for Xilinx Zynq on-chip EHCI USB controller"
+	depends on ARCH_ZYNQ
+	default y
+	---help---
+	  Enable support for Zynq on-chip EHCI USB controller
+
 config USB_EHCI_GENERIC
 	bool "Support for generic EHCI USB controller"
 	depends on OF_CONTROL
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@ -86,10 +86,8 @@
 # define CONFIG_ZYNQ_SDHCI_MAX_FREQ	52000000
 #endif

-#ifdef CONFIG_ZYNQ_USB
-# define CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_ZYNQ
 # define CONFIG_USB_STORAGE
-# define CONFIG_USB_EHCI_ZYNQ
 # define CONFIG_EHCI_IS_TDI
 # define CONFIG_USB_MAX_CONTROLLER_COUNT	2

--- a/include/configs/zynq_microzed.h
+++ b/include/configs/zynq_microzed.h
@ -12,8 +12,6 @@

 #define CONFIG_SYS_NO_FLASH

-#define CONFIG_ZYNQ_USB
-
 #include <configs/zynq-common.h>

 #endif /* __CONFIG_ZYNQ_MICROZED_H */
--- a/include/configs/zynq_picozed.h
+++ b/include/configs/zynq_picozed.h
@ -12,8 +12,6 @@

 #define CONFIG_SYS_NO_FLASH

-#define CONFIG_ZYNQ_USB
-
 #include <configs/zynq-common.h>

 #endif /* __CONFIG_ZYNQ_PICOZED_H */
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@ -12,7 +12,6 @@

 #define CONFIG_SYS_NO_FLASH

-#define CONFIG_ZYNQ_USB
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_EEPROM

--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@ -12,8 +12,6 @@

 #define CONFIG_SYS_NO_FLASH

-#define CONFIG_ZYNQ_USB
-
 #include <configs/zynq-common.h>

 #endif /* __CONFIG_ZYNQ_ZED_H */
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@ -13,7 +13,6 @@

 #define CONFIG_SYS_NO_FLASH

-#define CONFIG_ZYNQ_USB
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1