Patchwork [U-Boot,05/13] mxs: Squash the header file usage in ehci-mxs

login
register
mail settings
Submitter Marek Vasut
Date Feb. 23, 2013, 12:43 p.m.
Message ID <1361623389-31095-5-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/222725/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Marek Vasut - Feb. 23, 2013, 12:43 p.m.
The ehci-mxs driver included the register definitions directly.
Use imx-regs.h instead since it contains proper handling of the
differences between mx23 and mx28.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
---
 arch/arm/include/asm/arch-mxs/imx-regs.h |    2 ++
 drivers/usb/host/ehci-mxs.c              |    6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)
Otavio Salvador - Feb. 23, 2013, 3:32 p.m.
On Sat, Feb 23, 2013 at 9:43 AM, Marek Vasut <marex@denx.de> wrote:
> The ehci-mxs driver included the register definitions directly.
> Use imx-regs.h instead since it contains proper handling of the
> differences between mx23 and mx28.
>
> Signed-off-by: Marek Vasut <marex@denx.de>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Patch

diff --git a/arch/arm/include/asm/arch-mxs/imx-regs.h b/arch/arm/include/asm/arch-mxs/imx-regs.h
index 05eb63c..8f67497 100644
--- a/arch/arm/include/asm/arch-mxs/imx-regs.h
+++ b/arch/arm/include/asm/arch-mxs/imx-regs.h
@@ -36,6 +36,8 @@ 
 #include <asm/arch/regs-rtc.h>
 #include <asm/arch/regs-ssp.h>
 #include <asm/arch/regs-timrot.h>
+#include <asm/arch/regs-usb.h>
+#include <asm/arch/regs-usbphy.h>
 
 #ifdef CONFIG_MX23
 #include <asm/arch/regs-clkctrl-mx23.h>
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c
index 5062af5..0ca7545 100644
--- a/drivers/usb/host/ehci-mxs.c
+++ b/drivers/usb/host/ehci-mxs.c
@@ -21,11 +21,7 @@ 
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/regs-common.h>
-#include <asm/arch/regs-base.h>
-#include <asm/arch/regs-clkctrl-mx28.h>
-#include <asm/arch/regs-usb.h>
-#include <asm/arch/regs-usbphy.h>
+#include <asm/arch/imx-regs.h>
 
 #include "ehci.h"