projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-mxs
/
imx-regs.h
diff --git
a/arch/arm/include/asm/arch-mxs/imx-regs.h
b/arch/arm/include/asm/arch-mxs/imx-regs.h
index 9764041b48b12dea2cdd0948c30077f9f1623d24..8f6749776004c8ddf5eaea9b003056fb23c7d4f4 100644
(file)
--- a/
arch/arm/include/asm/arch-mxs/imx-regs.h
+++ b/
arch/arm/include/asm/arch-mxs/imx-regs.h
@@
-1,5
+1,5
@@
/*
/*
- * Freescale i.MX28 Registers
+ * Freescale i.MX2
3/i.MX2
8 Registers
*
* Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
* on behalf of DENX Software Engineering GmbH
*
* Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
* on behalf of DENX Software Engineering GmbH
@@
-36,6
+36,13
@@
#include <asm/arch/regs-rtc.h>
#include <asm/arch/regs-ssp.h>
#include <asm/arch/regs-timrot.h>
#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>
+#include <asm/arch/regs-power-mx23.h>
+#endif
#ifdef CONFIG_MX28
#include <asm/arch/regs-clkctrl-mx28.h>
#ifdef CONFIG_MX28
#include <asm/arch/regs-clkctrl-mx28.h>