[U-Boot] [PATCH] usb: Kconfig: Add Kconfigs entry USB_EHCI_ZYNQ

[Michal Simek]

On 20.7.2016 03:38, Marek Vasut wrote:
> On 07/19/2016 07:11 AM, Siva Durga Prasad Paladugu wrote:
>> 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 at xilinx.com>
> 
> Looks ok, except for a bit below. Michal, please double-check.

Sure.


>> ---
>> - This series is based on latest mainline
>> Changes for v2:
>> - Moved CONFIG_USB_EHCI_ZYNQ to Kconfig and removed
>>   config ZYNQ_USB as per review comment
>> ---
>>  configs/zynq_microzed_defconfig | 3 +++
>>  configs/zynq_picozed_defconfig  | 3 +++
>>  configs/zynq_zc702_defconfig    | 3 +++
>>  configs/zynq_zc706_defconfig    | 3 +++
>>  configs/zynq_zed_defconfig      | 3 +++
>>  configs/zynq_zybo_defconfig     | 3 +++
>>  drivers/usb/host/Kconfig        | 7 +++++++
>>  include/configs/zynq-common.h   | 4 +---
>>  include/configs/zynq_microzed.h | 2 --
>>  include/configs/zynq_picozed.h  | 2 --
>>  include/configs/zynq_zc70x.h    | 1 -
>>  include/configs/zynq_zed.h      | 2 --
>>  include/configs/zynq_zybo.h     | 1 -
>>  13 files changed, 26 insertions(+), 11 deletions(-)
>>
>> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
>> index d88c61b..91d5c82 100644
>> --- a/configs/zynq_microzed_defconfig
>> +++ b/configs/zynq_microzed_defconfig
>> @@ -38,6 +38,9 @@ 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_EHCI_ZYNQ=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 aeb1270..6d3aef5 100644
>> --- a/configs/zynq_picozed_defconfig
>> +++ b/configs/zynq_picozed_defconfig
>> @@ -28,6 +28,9 @@ 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_EHCI_ZYNQ=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 d68ed0e..57019da 100644
>> --- a/configs/zynq_zc702_defconfig
>> +++ b/configs/zynq_zc702_defconfig
>> @@ -43,6 +43,9 @@ 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_EHCI_ZYNQ=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 8bd9230..e19f34f 100644
>> --- a/configs/zynq_zc706_defconfig
>> +++ b/configs/zynq_zc706_defconfig
>> @@ -39,6 +39,9 @@ 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_EHCI_ZYNQ=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 c70b860..6cb8a80 100644
>> --- a/configs/zynq_zed_defconfig
>> +++ b/configs/zynq_zed_defconfig
>> @@ -38,6 +38,9 @@ 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_EHCI_ZYNQ=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 624545e..cce29bc 100644
>> --- a/configs/zynq_zybo_defconfig
>> +++ b/configs/zynq_zybo_defconfig
>> @@ -41,6 +41,9 @@ 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_EHCI_ZYNQ=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 89580cc..202cb29 100644
>> --- 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 n

Marek: Maybe make sense to have this as y if there is dependency on
ARCH_ZYNQ. It will shorten defconfigs.


>> +	---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 8dbac87..08b7602 100644
>> --- 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
> 
> How much of the stuff in this ifdef can be turned into Kconfig options ?
> I believe some of it is already Kconfig-ied.

USB_STORAGE yes. It can/should be done in the follow up patch which goes
via my tree.

Thanks,
Michal