diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:07:51 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:07:51 +0100 |
commit | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (patch) | |
tree | 377327a40452c4282787f49456122bf1753a0255 /arch/arm/plat-omap/include/plat/io.h | |
parent | 6a8d2e2b504ce3d12cfa3934f545c9415441a5c3 (diff) | |
parent | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (diff) | |
download | blackbird-op-linux-86c1e5a74af11e4817ffa6d7748d9ac1353b5b53.tar.gz blackbird-op-linux-86c1e5a74af11e4817ffa6d7748d9ac1353b5b53.zip |
Merge branch 'omap/dt' into next/dt
Diffstat (limited to 'arch/arm/plat-omap/include/plat/io.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index d72ec85c97e6..6591875486d5 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h @@ -228,13 +228,13 @@ #define OMAP44XX_EMIF2_PHYS OMAP44XX_EMIF2_BASE /* 0x4d000000 --> 0xfd200000 */ -#define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET) #define OMAP44XX_EMIF2_SIZE SZ_1M +#define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF1_VIRT + OMAP44XX_EMIF1_SIZE) #define OMAP44XX_DMM_PHYS OMAP44XX_DMM_BASE /* 0x4e000000 --> 0xfd300000 */ -#define OMAP44XX_DMM_VIRT (OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET) #define OMAP44XX_DMM_SIZE SZ_1M +#define OMAP44XX_DMM_VIRT (OMAP44XX_EMIF2_VIRT + OMAP44XX_EMIF2_SIZE) /* * ---------------------------------------------------------------------------- * Omap specific register access @@ -300,7 +300,7 @@ static inline void omap44xx_map_common_io(void) #endif extern void omap2_init_common_infrastructure(void); -extern void omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0, +extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1); #define __arch_ioremap omap_ioremap |