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

[Marek Vasut]

On 02/27/2017 05:14 PM, Roger Quadros wrote:
> On 23/02/17 15:39, 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 at ti.com>
>> Cc: Marek Vasut <marex at denx.de>
>> Cc: Roger Quadros <rogerq at ti.com>
>> Signed-off-by: Uri Mashiach <uri.mashiach at compulab.co.il>
> 
> Reviewed-by: Roger Quadros <rogerq at ti.com>

Thanks

Acked-by: Marek Vasut <marex at denx.de>

Feel free to pull through the omap tree as this seems part of a bigger
series.

>> ---
>> V1 -> V2: Replace the commit "fix XHCI registers base address".
>> V2 -> V3: Replace the commit "reintroduce the CONFIG_AM57XX symbol"
>> V3 -> V4: Replace boolean symbols USB_XHCI_DRA7XX_INDEX0 and USB_XHCI_DRA7XX_INDEX1 with
>> 	  integer symbol USB_XHCI_DRA7XX_INDEX.
>>
>>  configs/dra7xx_evm_defconfig    | 1 +
>>  configs/dra7xx_hs_evm_defconfig | 1 +
>>  drivers/usb/host/Kconfig        | 9 +++++++++
>>  include/linux/usb/xhci-omap.h   | 6 ++++--
>>  4 files changed, 15 insertions(+), 2 deletions(-)
>>
>> diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
>> index 26b26cc..05f7778 100644
>> --- a/configs/dra7xx_evm_defconfig
>> +++ b/configs/dra7xx_evm_defconfig
>> @@ -86,6 +86,7 @@ CONFIG_OMAP_TIMER=y
>>  CONFIG_USB=y
>>  CONFIG_USB_XHCI_HCD=y
>>  CONFIG_USB_XHCI_DWC3=y
>> +CONFIG_USB_XHCI_DRA7XX_INDEX=1
>>  CONFIG_USB_DWC3=y
>>  CONFIG_USB_DWC3_GADGET=y
>>  CONFIG_USB_DWC3_OMAP=y
>> diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
>> index 244940c..23ae2c7 100644
>> --- a/configs/dra7xx_hs_evm_defconfig
>> +++ b/configs/dra7xx_hs_evm_defconfig
>> @@ -91,6 +91,7 @@ CONFIG_OMAP_TIMER=y
>>  CONFIG_USB=y
>>  CONFIG_USB_XHCI_HCD=y
>>  CONFIG_USB_XHCI_DWC3=y
>> +CONFIG_USB_XHCI_DRA7XX_INDEX=1
>>  CONFIG_USB_DWC3=y
>>  CONFIG_USB_DWC3_GADGET=y
>>  CONFIG_USB_DWC3_OMAP=y
>> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
>> index 5129a57..3ff79fc 100644
>> --- a/drivers/usb/host/Kconfig
>> +++ b/drivers/usb/host/Kconfig
>> @@ -43,6 +43,15 @@ config USB_XHCI_ZYNQMP
>>  	help
>>  	  Enables support for the on-chip xHCI controller on Xilinx ZynqMP SoCs.
>>  
>> +config USB_XHCI_DRA7XX_INDEX
>> +	int "DRA7XX xHCI USB index"
>> +	range 0 1
>> +	default 0
>> +	depends on DRA7XX
>> +	help
>> +	  Select the DRA7XX xHCI USB index.
>> +	  Current supported values: 0, 1.
>> +
>>  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..f038ddb 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 _ASM_ARCH_XHCI_OMAP_H_
>>  
>> -#ifdef CONFIG_TARGET_DRA7XX_EVM
>> +#ifdef CONFIG_DRA7XX
>> +#if CONFIG_USB_XHCI_DRA7XX_INDEX == 1
>>  #define OMAP_XHCI_BASE 0x488d0000
>>  #define OMAP_OCP1_SCP_BASE 0x4A081000
>>  #define OMAP_OTG_WRAPPER_BASE 0x488c0000
>> -#elif defined CONFIG_TARGET_AM57XX_EVM
>> +#elif CONFIG_USB_XHCI_DRA7XX_INDEX == 0
>>  #define OMAP_XHCI_BASE 0x48890000
>>  #define OMAP_OCP1_SCP_BASE 0x4A084c00
>>  #define OMAP_OTG_WRAPPER_BASE 0x48880000
>> +#endif /* CONFIG_USB_XHCI_DRA7XX_INDEX == 1 */
>>  #elif defined CONFIG_AM43XX
>>  #define OMAP_XHCI_BASE 0x483d0000
>>  #define OMAP_OCP1_SCP_BASE 0x483E8000
>>
> 


-- 
Best regards,
Marek Vasut