summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2013-02-23 02:43:01 +0000
committerStefano Babic <sbabic@denx.de>2013-03-07 17:22:57 +0100
commit47f13315061b4f931a9263924627b870ec083578 (patch)
tree2e8d2dcb42b77718e164edf21d2950d9cb678dd5
parentd3f26a27003d55ce17ca54e84799fa18b965c3dc (diff)
downloadu-boot-imx-47f13315061b4f931a9263924627b870ec083578.zip
u-boot-imx-47f13315061b4f931a9263924627b870ec083578.tar.gz
u-boot-imx-47f13315061b4f931a9263924627b870ec083578.tar.bz2
mxs: Squash the header file usage in ehci-mxs
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> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--arch/arm/include/asm/arch-mxs/imx-regs.h2
-rw-r--r--drivers/usb/host/ehci-mxs.c6
2 files changed, 3 insertions, 5 deletions
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"