From patchwork Thu Aug 18 21:50:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 1077992 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7ILpS5J023516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Aug 2011 21:51:49 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuAUS-0003qU-Ua; Thu, 18 Aug 2011 21:51:05 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QuAUS-0001q5-ET; Thu, 18 Aug 2011 21:51:04 +0000 Received: from na3sys009aog125.obsmtp.com ([74.125.149.153]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuAUN-0001oz-VA for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2011 21:51:01 +0000 Received: from mail-yw0-f52.google.com ([209.85.213.52]) (using TLSv1) by na3sys009aob125.postini.com ([74.125.148.12]) with SMTP ID DSNKTk2JQEPJUWOk/6lv7QGDdWD3duxS7mcz@postini.com; Thu, 18 Aug 2011 14:50:59 PDT Received: by mail-yw0-f52.google.com with SMTP id 7so2456790ywo.39 for ; Thu, 18 Aug 2011 14:50:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nanometrics.ca; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=z6bPJ1fp/1uDyuAuMw91xz5L+cwqkujjaP/twnVahdU=; b=fxULV0DOD82nJbMsZDvyzM+K2hKsl52SA7Uq0/ovzmhqOXRkqhSHu7Df3GfBVYDo4K 0gKrtb3+0JMSdUngh57lfNmMYJm3gBYCdSk1JLHdZfK5etpCf8q805KkrOlqeTL7+oQe 1aJK80+tC/QA1lXVO9jADY4Qx3q2azMk/s+74= Received: by 10.236.9.69 with SMTP id 45mr1691116yhs.24.1313704256749; Thu, 18 Aug 2011 14:50:56 -0700 (PDT) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id s62sm2485298yhn.19.2011.08.18.14.50.55 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Aug 2011 14:50:55 -0700 (PDT) From: Ben Gardiner To: Sekhar Nori , davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 2/5] ARM: davinci: da850, omapl138: share boot_params Date: Thu, 18 Aug 2011 17:50:48 -0400 Message-Id: <4b305c5bad3d09ba46420ae9a440efb2c7fb88ba.1313702401.git.bengardiner@nanometrics.ca> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110818_175100_263567_7E6115C3 X-CRM114-Status: GOOD ( 14.28 ) X-Spam-Score: -2.4 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.153 listed in list.dnswl.org] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: James Nuss , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 18 Aug 2011 21:51:49 +0000 (UTC) Extract the value of .boot_params used by the da850/omapl138 machines to a common DA850_REFERENCE_BOOT_PARAMS defined in the da850-reference.h header introduced in a previous commit. Signed-off-by: Ben Gardiner Reviewed-by: James Nuss --- arch/arm/mach-davinci/board-da850-evm.c | 2 +- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- .../mach-davinci/include/mach/da850-reference.h | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 3ee12f3..f707bb2 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -1259,7 +1259,7 @@ console_initcall(da850_evm_console_init); #endif MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") - .boot_params = (DA8XX_DDR_BASE + 0x100), + .boot_params = DA850_REFERENCE_BOOT_PARAMS, .map_io = da850_reference_map_io, .init_irq = cp_intc_init, .timer = &davinci_timer, diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index c256858..998cd2e 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -561,7 +561,7 @@ console_initcall(mityomapl138_console_init); #endif MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808") - .boot_params = (DA8XX_DDR_BASE + 0x100), + .boot_params = DA850_REFERENCE_BOOT_PARAMS, .map_io = da850_reference_map_io, .init_irq = cp_intc_init, .timer = &davinci_timer, diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 5d556cf..cfad483 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -334,7 +334,7 @@ console_initcall(omapl138_hawk_console_init); #endif MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard") - .boot_params = (DA8XX_DDR_BASE + 0x100), + .boot_params = DA850_REFERENCE_BOOT_PARAMS, .map_io = da850_reference_map_io, .init_irq = cp_intc_init, .timer = &davinci_timer, diff --git a/arch/arm/mach-davinci/include/mach/da850-reference.h b/arch/arm/mach-davinci/include/mach/da850-reference.h index d3beb13..6837a98 100644 --- a/arch/arm/mach-davinci/include/mach/da850-reference.h +++ b/arch/arm/mach-davinci/include/mach/da850-reference.h @@ -9,6 +9,10 @@ #ifndef __ASM_ARCH_DAVINCI_DA850_REFERENCE_H #define __ASM_ARCH_DAVINCI_DA850_REFERENCE_H +#include + +#define DA850_REFERENCE_BOOT_PARAMS (DA8XX_DDR_BASE + 0x100) + void __init da850_reference_map_io(void); #endif /* __ASM_ARCH_DAVINCI_DA850_REFERENCE_H */