From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King - ARM Linux Subject: Re: [PATCH v2 05/11] msm: Physical offset for MSM8960 Date: Mon, 24 Jan 2011 23:31:38 +0000 Message-ID: <20110124233138.GS24104@n2100.arm.linux.org.uk> References: <1292384961-8851-1-git-send-email-stepanm@codeaurora.org> <1295468747-22796-1-git-send-email-davidb@codeaurora.org> <1295468747-22796-6-git-send-email-davidb@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from caramon.arm.linux.org.uk ([78.32.30.218]:53192 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751915Ab1AXXb7 (ORCPT ); Mon, 24 Jan 2011 18:31:59 -0500 Content-Disposition: inline In-Reply-To: <1295468747-22796-6-git-send-email-davidb@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: David Brown Cc: linux-arm-msm@vger.kernel.org, Sergei Shtylyov , Stepan Moskovchenko , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org On Wed, Jan 19, 2011 at 12:25:41PM -0800, David Brown wrote: > From: Stepan Moskovchenko > > Add the physical memory offset value for the Qualcomm > MSM8960 chip. > > Signed-off-by: Stepan Moskovchenko > Signed-off-by: David Brown > --- > arch/arm/mach-msm/include/mach/memory.h | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h > index 070e17d..014bbd3 100644 > --- a/arch/arm/mach-msm/include/mach/memory.h > +++ b/arch/arm/mach-msm/include/mach/memory.h > @@ -25,6 +25,8 @@ > #define PHYS_OFFSET UL(0x00200000) > #elif defined(CONFIG_ARCH_MSM8X60) > #define PHYS_OFFSET UL(0x40200000) > +#elif defined(CONFIG_ARCH_MSM8960) > +#define PHYS_OFFSET UL(0x40200000) Note that this will all change during the next merge window to PLAT_PHYS_OFFSET.