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>

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index bab00fc687656e5f76ed36bb39972e283f55b6ca..c4139d9d070e26e39877f3a9cf02365514c1c409 100644 (file)
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -38,6 +38,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y

diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index eeb0fab94d34d70a8b5245dcdf6df13c73e6dc12..6cb31615de39c539dffadc9fd6f8d8b4e48de14b 100644 (file)
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -28,6 +28,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_ZYNQ_SDHCI=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y

diff --git a/configs/zynq_zc702_RSA_defconfig b/configs/zynq_zc702_RSA_defconfig
index 90dbe0c49ff2f80eef97d85038baa10aa06bb318..234331fce53839e9d38835c06ac2b88affe9d038 100644 (file)
--- a/configs/zynq_zc702_RSA_defconfig
+++ b/configs/zynq_zc702_RSA_defconfig
@@ -47,6 +47,7 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
 CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y

diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 0ee79ace844b153ece9566071c7b382dc9ae80b2..d7370a63f5a8ae8fb5bacfc4f6e80d43d40cc849 100644 (file)
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -45,6 +45,7 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
 CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index dbc91739dd6ac8a5e0c344295396b76ffe71da34..3ec6427232ccf572bc92a287918010ef555cbb18 100644 (file)
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 1956312ee8c88440110183a33581b05216696f42..784693c6fbc4c45610ea488d228f892a4bf87158 100644 (file)
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -38,6 +38,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index bafc3b5dfce66861294a644bff573c20252b4492..3036fdda648534a40f9be9cf280ecafb9421558d 100644 (file)
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -41,6 +41,7 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
 CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 89580cc31f786b936096c0cc94cff0009b9f0623..5092251ee0b7ef0222f937b07fe4b5ad2d1a9494 100644 (file)
--- 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

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 5675d0b6b5972a38a6e8a499a1605c6ab616a242..34e61068ce1202e676423e2fbe3aab8681fa6e99 100644 (file)
--- 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
 

diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
index ec7bb1cef55386b0ca5f3e3d644cde1e60dc550f..e66088da4f795961ec4bc30e6b41de4a281a2c83 100644 (file)
--- 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 */

diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
index adc4d0f11e675199fbf3e6ca5d4de11c4749e9e4..f2598a2bb8f9b0f14f4f56c7f56c56188875eb7c 100644 (file)
--- 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 */

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 8a045900f62dce7af24a46593b4a49ca7e190f9a..a27b49cdf2b9299cf6f4ba450199fbaa8b781376 100644 (file)
--- 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
 

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 150cb4a0df9733003ff3f7620dd4655d7994af8e..dbb4621a5e817dfcf9f0787a257a8a990b6ba967 100644 (file)
--- 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 */

diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 637b1c5ffe9134aeb7a1310db5003b49f2cb1a36..ca3ad9c915843d79c3cc545e7ecc8e0ba80836fe 100644 (file)
--- 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