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: 1078062 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7ILqx4p017302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Aug 2011 21:53:20 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p7ILpv9V027438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 18 Aug 2011 16:51:57 -0500 Received: from linux.omap.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep33.itg.ti.com (8.13.7/8.13.8) with ESMTP id p7ILpu3U012258; Thu, 18 Aug 2011 16:51:56 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 7CBCD80636; Thu, 18 Aug 2011 16:51:48 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 2C90480639 for ; Thu, 18 Aug 2011 16:50:58 -0500 (CDT) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dflp51.itg.ti.com (8.13.7/8.13.8) with ESMTP id p7ILowe4004292 for ; Thu, 18 Aug 2011 16:50:58 -0500 (CDT) Received: from psmtp.com (na3sys009amx204.postini.com [74.125.149.44]) by red.ext.ti.com (8.13.7/8.13.7) with SMTP id p7ILovpu020770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Aug 2011 16:50:57 -0500 Received: from na3sys009aog122.obsmtp.com ([74.125.149.147]) (using TLSv1) by na3sys009amx204.postini.com ([74.125.148.10]) with SMTP; Thu, 18 Aug 2011 14:50:57 PDT Received: from mail-gx0-f180.google.com ([209.85.161.180]) (using TLSv1) by na3sys009aob122.postini.com ([74.125.148.12]) with SMTP ID DSNKTk2JQEPJUWOk/6lv7QGDdWD3duxS7mcz@postini.com; Thu, 18 Aug 2011 14:50:57 PDT Received: by mail-gx0-f180.google.com with SMTP id 10so2457477gxk.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-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [35/1] Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: davinci-linux-open-source@linux.davincidsp.com 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: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 18 Aug 2011 21:53:20 +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 */