diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:20:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:20:51 +0200 |
| commit | 9844d027b52cc89264f6bf7686e26d9dc50134fd (patch) | |
| tree | e1e89eeab5e44dc91fe3a4a3a497f1d1e178f925 /arch/arm/include/asm/arch-omap4/omap4.h | |
| parent | 201532a69cf7e7a84bff354fdab45947425d22b4 (diff) | |
| parent | 1b03eede4fed47c6af7df84b0f7b621ff3e3bb40 (diff) | |
| download | talos-obmc-uboot-9844d027b52cc89264f6bf7686e26d9dc50134fd.tar.gz talos-obmc-uboot-9844d027b52cc89264f6bf7686e26d9dc50134fd.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'arch/arm/include/asm/arch-omap4/omap4.h')
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/omap4.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h index 5243ea8e7f..79ff22cf31 100644 --- a/arch/arm/include/asm/arch-omap4/omap4.h +++ b/arch/arm/include/asm/arch-omap4/omap4.h @@ -44,6 +44,8 @@ /* CONTROL */ #define CTRL_BASE (OMAP44XX_L4_CORE_BASE + 0x2000) +#define CONTROL_PADCONF_CORE (OMAP44XX_L4_CORE_BASE + 0x100000) +#define CONTROL_PADCONF_WKUP (OMAP44XX_L4_CORE_BASE + 0x31E000) /* UART */ #define UART1_BASE (OMAP44XX_L4_PER_BASE + 0x6a000) |
