From: Nishanth Menon Date: Tue, 29 Nov 2016 09:51:59 +0000 (+0530) Subject: usb: xhci: Remove assumption of DWC instance based on DRA7 SoC type X-Git-Tag: v2017.01-rc1~96 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=042fdb7cabb8270eb86c45f11263fa91c12e3b65;p=oweals%2Fu-boot.git usb: xhci: Remove assumption of DWC instance based on DRA7 SoC type 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 Signed-off-by: Lokesh Vutla Reviewed-by: Tom Rini --- diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h index cb166e6a6c..9de80d738e 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