From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH 8/8] OMAP4: Fix the emif and dmm virtual mapping Date: Fri, 16 Sep 2011 10:56:50 -0700 Message-ID: <87r53gnzfh.fsf@ti.com> References: <1315459327-3285-1-git-send-email-santosh.shilimkar@ti.com> <1315459327-3285-9-git-send-email-santosh.shilimkar@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from na3sys009aog105.obsmtp.com ([74.125.149.75]:39310 "EHLO na3sys009aog105.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750755Ab1IPR4z (ORCPT ); Fri, 16 Sep 2011 13:56:55 -0400 Received: by mail-yx0-f173.google.com with SMTP id 11so3991253yxl.18 for ; Fri, 16 Sep 2011 10:56:54 -0700 (PDT) In-Reply-To: <1315459327-3285-9-git-send-email-santosh.shilimkar@ti.com> (Santosh Shilimkar's message of "Thu, 8 Sep 2011 10:52:07 +0530") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Santosh Shilimkar Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Girish S G Santosh Shilimkar 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@ti.com: Helped fixing comments.] > Signed-off-by: Girish S G > Signed-off-by: Santosh Shilimkar > --- > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@ti.com (Kevin Hilman) Date: Fri, 16 Sep 2011 10:56:50 -0700 Subject: [PATCH 8/8] OMAP4: Fix the emif and dmm virtual mapping In-Reply-To: <1315459327-3285-9-git-send-email-santosh.shilimkar@ti.com> (Santosh Shilimkar's message of "Thu, 8 Sep 2011 10:52:07 +0530") References: <1315459327-3285-1-git-send-email-santosh.shilimkar@ti.com> <1315459327-3285-9-git-send-email-santosh.shilimkar@ti.com> Message-ID: <87r53gnzfh.fsf@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Santosh Shilimkar 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 at ti.com: Helped fixing comments.] > Signed-off-by: Girish S G > Signed-off-by: Santosh Shilimkar > --- > 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