From patchwork Thu Aug 18 21:50:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 1078012 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 p7ILq8Rs024496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Aug 2011 21:52:29 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuAV9-0004Lq-8q; Thu, 18 Aug 2011 21:51:47 +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 1QuAV4-0001wM-Bq; Thu, 18 Aug 2011 21:51:42 +0000 Received: from na3sys009aog118.obsmtp.com ([74.125.149.244]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuAUO-0001p0-Kg for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2011 21:51:03 +0000 Received: from mail-gy0-f178.google.com ([209.85.160.178]) (using TLSv1) by na3sys009aob118.postini.com ([74.125.148.12]) with SMTP ID DSNKTk2JQRitYCdaZirbGAMPgDr7ZzluHETY@postini.com; Thu, 18 Aug 2011 14:51:00 PDT Received: by mail-gy0-f178.google.com with SMTP id 3so2004247gyh.37 for ; Thu, 18 Aug 2011 14:50:57 -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=a+cGhZY4NtV+kOtyisNZDE+yTFw4/87qEs+PjUwyH3w=; b=TFKLagtb2Qw+M4SzP4K7p1ajzVMDvuE4G76NSyOIhMssWHiCXcfiJYdXft7mPrv7U6 tEPbcZc0InOxNKWJxDPs+ZVNe9UyheEItmO8/w4T5pihOhkhPanVQSu/mxKGJzYwlncB 2CrYy+YLAV6jGKAIMn4yJVtIyFMeINOFpO2TI= Received: by 10.236.189.65 with SMTP id b41mr1557206yhn.64.1313704257762; Thu, 18 Aug 2011 14:50:57 -0700 (PDT) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id s62sm2485298yhn.19.2011.08.18.14.50.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Aug 2011 14:50:57 -0700 (PDT) From: Ben Gardiner To: Sekhar Nori , davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 3/5] ARM: davinci: da850, omapl138: share the preferred console registration Date: Thu, 18 Aug 2011 17:50:49 -0400 Message-Id: <3e3d2dfabd7a2cbf9650986a83bd238ec927d1ad.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_974324_42F1376E X-CRM114-Status: GOOD ( 14.39 ) 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.244 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:52:29 +0000 (UTC) Extract the common add_preferred_console("ttyS", 2, "115200") found both of the da850evm and hawk boards into a shared function in the da850-reference object 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-omapl138-hawk.c | 2 +- arch/arm/mach-davinci/da850-reference.c | 7 +++++++ .../mach-davinci/include/mach/da850-reference.h | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index f707bb2..109b016 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -1253,7 +1253,7 @@ static int __init da850_evm_console_init(void) if (!machine_is_davinci_da850_evm()) return 0; - return add_preferred_console("ttyS", 2, "115200"); + return da850_reference_add_preferred_console(); } console_initcall(da850_evm_console_init); #endif diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index cfad483..73d826d 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -328,7 +328,7 @@ static int __init omapl138_hawk_console_init(void) if (!machine_is_omapl138_hawkboard()) return 0; - return add_preferred_console("ttyS", 2, "115200"); + return da850_reference_add_preferred_console(); } console_initcall(omapl138_hawk_console_init); #endif diff --git a/arch/arm/mach-davinci/da850-reference.c b/arch/arm/mach-davinci/da850-reference.c index 67b327b..25df6476 100644 --- a/arch/arm/mach-davinci/da850-reference.c +++ b/arch/arm/mach-davinci/da850-reference.c @@ -7,9 +7,16 @@ * or implied. */ +#include + #include void __init da850_reference_map_io(void) { da850_init(); } + +int da850_reference_add_preferred_console(void) +{ + return add_preferred_console("ttyS", 2, "115200"); +} diff --git a/arch/arm/mach-davinci/include/mach/da850-reference.h b/arch/arm/mach-davinci/include/mach/da850-reference.h index 6837a98..ed72c53 100644 --- a/arch/arm/mach-davinci/include/mach/da850-reference.h +++ b/arch/arm/mach-davinci/include/mach/da850-reference.h @@ -14,5 +14,6 @@ #define DA850_REFERENCE_BOOT_PARAMS (DA8XX_DDR_BASE + 0x100) void __init da850_reference_map_io(void); +int da850_reference_add_preferred_console(void); #endif /* __ASM_ARCH_DAVINCI_DA850_REFERENCE_H */