usb: ehci-mx6: Rename the USB register base address
Subsystems (4)
PATCH 1/1 usb: ehci-mx6: Rename the USB register base address
The mx6sl/mx6sx has 2 OTG and 1 host. So they have name "USBO2H_USB_BASE_ADDR" in imx-regs.h. The driver hard codes the USB base address name to "USBOH3", which causes the driver failed to build for mx6sl/mx6sx.
This patch uniform the address name to "USB_BASE_ADDR" for all mx6 series.
--- arch/arm/include/asm/arch-mx6/imx-regs.h | 9 ++------- drivers/usb/host/ehci-mx6.c | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-mx6/imx-regs.h +2 -7
@@ -215,13 +215,8 @@#define AIPS2_OFF_BASE_ADDR (ATZ2_BASE_ADDR + 0x80000)#define CAAM_BASE_ADDR (ATZ2_BASE_ADDR)#define ARM_BASE_ADDR (ATZ2_BASE_ADDR + 0x40000) -#ifdef CONFIG_MX6SL -#define USBO2H_PL301_IPS_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x0000) -#define USBO2H_USB_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x4000) -#else -#define USBOH3_PL301_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x0000) -#define USBOH3_USB_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x4000) -#endif +#define USB_PL301_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x0000) +#define USB_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x4000)#define ENET_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x8000)#ifdef CONFIG_MX6SL
drivers/usb/host/ehci-mx6.c +2 -2
@@ -174,7 +174,7 @@ struct usbnc_regs {static void usb_oc_config (int index) { -struct usbnc_regs *usbnc = (struct usbnc_regs *)(USBOH3_USB_BASE_ADDR + +struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR +USB_OTHERREGS_OFFSET );void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]);u32 val;
@@ -207,7 +207,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr **hccr, struct ehci_hcor **hcor) { enum usb_init_type type; -struct usb_ehci *ehci = (struct usb_ehci *)(USBOH3_USB_BASE_ADDR + +struct usb_ehci *ehci = (struct usb_ehci *)(USB_BASE_ADDR + (0x200 * index));if (index >3 )
Signature · 1 line
1.7.4.1
PATCH 1/1 usb: ehci-mx6: Rename the USB register base address
Quoted 10 lines · Ye.Li
The mx6sl/mx6sx has 2 OTG and 1 host. So they have name "
USBO2H_USB_BASE_ADDR" inimx-regs.h. The driver hard codes the USB base address name to "USBOH3", which causes the driver failed to build for mx6sl/mx6sx.This patch uniform the address name to "
USB_BASE_ADDR" for all mx6 series.Signed-off-by Ye.Li <[email protected]>---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================