diff mbox

[U-Boot,1/2] usb: xhci: Remove assumption of DWC instance based on DRA7 SoC type

Message ID 20161129095200.19884-2-lokeshvutla@ti.com
State Accepted
Commit 042fdb7cabb8270eb86c45f11263fa91c12e3b65
Delegated to: Tom Rini
Headers show

Commit Message

Lokesh Vutla Nov. 29, 2016, 9:51 a.m. UTC 
From: Nishanth Menon <nm@ti.com>

Both AM57xx and DRA7xx share the same set of base addresses for DWC
controllers. The usage however differ with DWC2 instance used typically
in AM57xx evms while DWC1 instances used in DRA7x platforms.

Use TARGET_SOC config to differentiate so that CONFIG_AM57XX can be dropped.

Eventually, this needs to be dt-fied.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 include/linux/usb/xhci-omap.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Tom Rini Nov. 29, 2016, 6:05 p.m. UTC | #1 
On Tue, Nov 29, 2016 at 03:21:59PM +0530, Lokesh Vutla wrote:

> From: Nishanth Menon <nm@ti.com>
> 
> Both AM57xx and DRA7xx share the same set of base addresses for DWC
> controllers. The usage however differ with DWC2 instance used typically
> in AM57xx evms while DWC1 instances used in DRA7x platforms.
> 
> Use TARGET_SOC config to differentiate so that CONFIG_AM57XX can be dropped.
> 
> Eventually, this needs to be dt-fied.
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini Dec. 4, 2016, 12:49 a.m. UTC | #2 
On Tue, Nov 29, 2016 at 03:21:59PM +0530, Lokesh Vutla wrote:

> From: Nishanth Menon <nm@ti.com>
> 
> Both AM57xx and DRA7xx share the same set of base addresses for DWC
> controllers. The usage however differ with DWC2 instance used typically
> in AM57xx evms while DWC1 instances used in DRA7x platforms.
> 
> Use TARGET_SOC config to differentiate so that CONFIG_AM57XX can be dropped.
> 
> Eventually, this needs to be dt-fied.
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h
index cb166e6..9de80d7 100644
--- a/include/linux/usb/xhci-omap.h
+++ b/include/linux/usb/xhci-omap.h
@@ -10,11 +10,11 @@ 
 #ifndef _ASM_ARCH_XHCI_OMAP_H_
 #define _ASM_ARCH_XHCI_OMAP_H_
 
-#ifdef CONFIG_DRA7XX
+#ifdef CONFIG_TARGET_DRA7XX_EVM
 #define OMAP_XHCI_BASE 0x488d0000
 #define OMAP_OCP1_SCP_BASE 0x4A081000
 #define OMAP_OTG_WRAPPER_BASE 0x488c0000
-#elif defined CONFIG_AM57XX
+#elif defined CONFIG_TARGET_AM57XX_EVM
 #define OMAP_XHCI_BASE 0x48890000
 #define OMAP_OCP1_SCP_BASE 0x4A084c00
 #define OMAP_OTG_WRAPPER_BASE 0x48880000