[U-Boot] [PATCH v3 2/7] arm: usb: dra7xx: xHCI registers based on USB port index

Uri Mashiach
2017-02-19T14:55:38Z

On 02/19/2017 04:27 PM, Marek Vasut wrote:
> On 02/19/2017 02:27 PM, Uri Mashiach wrote:
>> Modify the determination of the base address of xHCI registers of DRA7XX
>> targets.
>> Before the commit: by the target.
>> After the commit: by the USB port index.
>>
>> Cc: Lokesh Vutla <lokeshvutla@ti.com>
>> Cc: Marek Vasut <marex@denx.de>
>> Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
>> ---
>> V1 -> V2: Replace the commit "fix XHCI registers base address".
>> V2 -> V3: Replace the commit "reintroduce the CONFIG_AM57XX symbol"
>>
>> configs/dra7xx_evm_defconfig | 1 +
>> configs/dra7xx_hs_evm_defconfig | 1 +
>> drivers/usb/host/Kconfig | 16 ++++++++++++++++
>> include/linux/usb/xhci-omap.h | 6 ++++--
>> 4 files changed, 22 insertions(+), 2 deletions(-)
>>
>> diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
>> index 26b26cc..1f47f92 100644

[...]

>> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
>> index 5129a57..440fbcf 100644
>> --- a/drivers/usb/host/Kconfig
>> +++ b/drivers/usb/host/Kconfig
>> @@ -43,6 +43,22 @@ config USB_XHCI_ZYNQMP
>> help
>> Enables support for the on-chip xHCI controller on Xilinx ZynqMP SoCs.
>>
>> +choice
>> + prompt "DRA7XX xHCI USB index select"
>> + depends on DRA7XX
>> +
>> +config USB_XHCI_DRA7XX_INDEX0
>> + bool "USB0"
>> + help
>> + DRA7XX xHCI USB0.
>> +
>> +config USB_XHCI_DRA7XX_INDEX1
>> + bool "USB1"
>> + help
>> + DRA7XX xHCI USB1.
>
> What is this all about ? Shouldn't this come from DT ? And what if I
> want to use both XHCI ? This looks totally bogus ...
>

The support for both XHCI is currently missing.
This could be a temporary solution until the DT solution.
The current situation is worse - selecting USB0 or USB1 based on the target.

>> +endchoice
>> +
>> endif # USB_XHCI_HCD
>>
>> config USB_EHCI_HCD
>> diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h
>> index 9de80d7..3f65a76 100644
>> --- a/include/linux/usb/xhci-omap.h
>> +++ b/include/linux/usb/xhci-omap.h
>> @@ -10,14 +10,16 @@
>> #ifndef _ASM_ARCH_XHCI_OMAP_H_

[...]

>> #define OMAP_OCP1_SCP_BASE 0x483E8000
>>
>
>

--
Regards,
Uri