From 6dc06f51036516f1b7ceef01ba174940e74d9c2a Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Fri, 24 Jun 2011 20:31:27 -0500 Subject: [PATCH] --- yaml --- r: 272895 b: refs/heads/master c: cefcadeaa7d5681b88b3ee2272d961c23a70a091 h: refs/heads/master i: 272893: 3399ef264f990412a69ddfcf6f06d113b2b9ca84 272891: 8514a2b03e1b0d7e1e6e79a5aa26c96a2aa07e63 272887: 7ca1147a6e87723033bf3bf55416c224d2523c50 272879: d297469db1c3656b1d9423b428c6402c53565f59 272863: 3daf4544d49b34c7da2ca79cdce11f6604b9e140 272831: b24d8c6a743aa9ddc6ad29370e3208dceb1f77d0 272767: e423c38c8359587aee341e68eff88bf7dfdf86c9 272639: 3d05b2e98aa59135f5aa2c6e3cb0dbf9464105aa 272383: b59ddc0bf7a22a5ecab80c0086a3902da70a1d43 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/include/plat/io.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6866a787fc10..42d66a6b57be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 551a9fa9b1f01aa16f9007337b3cc12216c732fa +refs/heads/master: cefcadeaa7d5681b88b3ee2272d961c23a70a091 diff --git a/trunk/arch/arm/plat-omap/include/plat/io.h b/trunk/arch/arm/plat-omap/include/plat/io.h index d72ec85c97e6..fb5fd246897b 100644 --- a/trunk/arch/arm/plat-omap/include/plat/io.h +++ b/trunk/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