Santosh Shilimkar <santosh.shilimkar@xxxxxx> writes: > Fix the address overlap with Emulation domain (EMU). > > The previous mapping was entering into EMU mapping > and was not as per comments. Fix the mapping accordingly. > > [girishsg@xxxxxx: Helped fixing comments.] > Signed-off-by: Girish S G <girishsg@xxxxxx> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > --- > arch/arm/plat-omap/include/plat/io.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h > index d72ec85..a2f7d31 100644 > --- a/arch/arm/plat-omap/include/plat/io.h > +++ b/arch/arm/plat-omap/include/plat/io.h > @@ -228,12 +228,12 @@ > > #define OMAP44XX_EMIF2_PHYS OMAP44XX_EMIF2_BASE > /* 0x4d000000 --> 0xfd200000 */ > -#define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET) > +#define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF1_VIRT + SZ_1M) IMO, this would be much clearer (and future proof) if you used '+ OMAP44XX_EMIF1_SIZE' instead of SZ_1M. > #define OMAP44XX_EMIF2_SIZE SZ_1M > > #define OMAP44XX_DMM_PHYS OMAP44XX_DMM_BASE > /* 0x4e000000 --> 0xfd300000 */ > -#define OMAP44XX_DMM_VIRT (OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET) > +#define OMAP44XX_DMM_VIRT (OMAP44XX_EMIF2_VIRT + SZ_1M) and '+ OMAP44XX_EMIF2_SIZE' here. > #define OMAP44XX_DMM_SIZE SZ_1M > /* > * ---------------------------------------------------------------------------- Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html