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 d0b1ec9463b7aef7bc3ef60561d35df3bad12e8a..833794819f2c2ba41aadb6c98e58fc10bae4033d 100644 (file)
--- 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_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
 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 36244248667d9159d1aee779f3605431089614b6..6eb8f03d5508556634086c2a8a2afaf9ee665b42 100644 (file)
--- 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_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
 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 e1b1fc93576cd5cf8e65720789395a752991e43b..b9e13f2214b4ef72663d6a285d29630cc08f1fc8 100644 (file)
--- 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_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
 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 63d32d90ddd0a08fe7576efdfe87a6b4e56a4be2..c13c077fe75d3bf037e554a3227e203dfd2a3110 100644 (file)
--- 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_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
 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 7783eeb0f6c7626602cf030d4729422a7a435006..c23e664db54db9cae2f60420c230b00b3162c28d 100644 (file)
--- 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_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
 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 9236c5e8274573ef6b0147edc54955681bc6b5af..c5884e21c90b2448f91129a661b8e661d224a68a 100644 (file)
--- 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_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
 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.
 
          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
 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 8dbac8728f050dda7e9329e5a0ca753705c80e19..08b7602ba170f207a1820ec5a80e688256a068ae 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
 
 # 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_STORAGE

-# define CONFIG_USB_EHCI_ZYNQ

 # define CONFIG_EHCI_IS_TDI
 # define CONFIG_USB_MAX_CONTROLLER_COUNT       2
 
 # 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_SYS_NO_FLASH
 

-#define CONFIG_ZYNQ_USB
-

 #include <configs/zynq-common.h>
 
 #endif /* __CONFIG_ZYNQ_MICROZED_H */
 #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_SYS_NO_FLASH
 

-#define CONFIG_ZYNQ_USB
-

 #include <configs/zynq-common.h>
 
 #endif /* __CONFIG_ZYNQ_PICOZED_H */
 #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_SYS_NO_FLASH
 

-#define CONFIG_ZYNQ_USB

 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_EEPROM
 
 #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_SYS_NO_FLASH
 

-#define CONFIG_ZYNQ_USB
-

 #include <configs/zynq-common.h>
 
 #endif /* __CONFIG_ZYNQ_ZED_H */
 #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_SYS_NO_FLASH
 

-#define CONFIG_ZYNQ_USB

 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1