From patchwork Thu Aug 18 21:50:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 1078002 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7ILpbJi016519 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Aug 2011 21:51:58 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuAUl-00042m-EC; Thu, 18 Aug 2011 21:51:23 +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 1QuAUk-0001tI-RV; Thu, 18 Aug 2011 21:51:22 +0000 Received: from na3sys009aog126.obsmtp.com ([74.125.149.155]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuAUN-0001ox-TG for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2011 21:51:01 +0000 Received: from mail-yi0-f52.google.com ([209.85.218.52]) (using TLSv1) by na3sys009aob126.postini.com ([74.125.148.12]) with SMTP ID DSNKTk2JP51FlXBwzJh5Vl/JeSWV7jkTdVtP@postini.com; Thu, 18 Aug 2011 14:50:59 PDT Received: by mail-yi0-f52.google.com with SMTP id 13so2615334yie.11 for ; Thu, 18 Aug 2011 14:50:55 -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=dOYey5KjAvCbsDg8GWDNuI0ay6/fLxpgDhk80e17vsg=; b=mFqd4+03t8K4DdvJMymO65CgeLus7k1nHeA7+B4aNfvBpfiSqXHFW5o3IlMcEbLZvm QA3JxWjcZxG6AB4xPzqPf/KTZTimQ4b8d/mSPrptSo7FkJZrcXztztkJNiUYYOnXuTmm KYNgVcWlktWRkQfIph+jQ/WFbwht4TIqiUL/0= Received: by 10.236.75.161 with SMTP id z21mr1666791yhd.29.1313704255326; Thu, 18 Aug 2011 14:50:55 -0700 (PDT) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id s62sm2485298yhn.19.2011.08.18.14.50.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Aug 2011 14:50:54 -0700 (PDT) From: Ben Gardiner To: Sekhar Nori , davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 1/5] ARM: davinci: da850, omapl138: introduce shared da850 reference components Date: Thu, 18 Aug 2011 17:50:47 -0400 Message-Id: <6650d6c73c2f5a8c4825c91cd8940fe88e46ba03.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_263983_509AF455 X-CRM114-Status: GOOD ( 16.60 ) 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.155 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 (demeter1.kernel.org [140.211.167.41]); Thu, 18 Aug 2011 21:51:58 +0000 (UTC) Several of the pieces of the da850 evm reference design board support in board-da850-evm.c are re-used by the other da850/omapl138 boards. Examples are boot_params, map_io, preferred-serial-console, davinci_uart_config's enabled_uarts to name a few. Introduce an object file to contain these shared pieces for re-use by the other da850/omapl138 boards. Kick it off with sharing the machine map_io which before this change was repeated in each of board-da850-evm.c, board-mityomapl138.c and board-omapl138-hawk.c. Since these machines are all included in the da8xx_omapl_defconfig, there is benefit to sharing a definition here. Signed-off-by: Ben Gardiner Reviewed-by: James Nuss --- arch/arm/mach-davinci/Makefile | 3 ++- arch/arm/mach-davinci/board-da850-evm.c | 8 ++------ arch/arm/mach-davinci/board-mityomapl138.c | 8 ++------ arch/arm/mach-davinci/board-omapl138-hawk.c | 8 ++------ arch/arm/mach-davinci/da850-reference.c | 15 +++++++++++++++ .../mach-davinci/include/mach/da850-reference.h | 14 ++++++++++++++ 6 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 arch/arm/mach-davinci/da850-reference.c create mode 100644 arch/arm/mach-davinci/include/mach/da850-reference.h diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 0b87a1c..9a01441 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -15,7 +15,8 @@ obj-$(CONFIG_ARCH_DAVINCI_DM355) += dm355.o devices.o obj-$(CONFIG_ARCH_DAVINCI_DM646x) += dm646x.o devices.o obj-$(CONFIG_ARCH_DAVINCI_DM365) += dm365.o devices.o obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o devices-da8xx.o -obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o +obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o\ + da850-reference.o obj-$(CONFIG_ARCH_DAVINCI_TNETV107X) += tnetv107x.o devices-tnetv107x.o obj-$(CONFIG_ARCH_DAVINCI_TNETV107X) += gpio-tnetv107x.o diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 3d2c0d7..3ee12f3 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -1257,14 +1258,9 @@ static int __init da850_evm_console_init(void) console_initcall(da850_evm_console_init); #endif -static void __init da850_evm_map_io(void) -{ - da850_init(); -} - MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") .boot_params = (DA8XX_DDR_BASE + 0x100), - .map_io = da850_evm_map_io, + .map_io = da850_reference_map_io, .init_irq = cp_intc_init, .timer = &davinci_timer, .init_machine = da850_evm_init, diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index 606a6f2..c256858 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -559,14 +560,9 @@ static int __init mityomapl138_console_init(void) console_initcall(mityomapl138_console_init); #endif -static void __init mityomapl138_map_io(void) -{ - da850_init(); -} - MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808") .boot_params = (DA8XX_DDR_BASE + 0x100), - .map_io = mityomapl138_map_io, + .map_io = da850_reference_map_io, .init_irq = cp_intc_init, .timer = &davinci_timer, .init_machine = mityomapl138_init, diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 67c38d0..5d556cf 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -19,6 +19,7 @@ #include #include +#include #include #define HAWKBOARD_PHY_ID "0:07" @@ -332,14 +333,9 @@ static int __init omapl138_hawk_console_init(void) console_initcall(omapl138_hawk_console_init); #endif -static void __init omapl138_hawk_map_io(void) -{ - da850_init(); -} - MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard") .boot_params = (DA8XX_DDR_BASE + 0x100), - .map_io = omapl138_hawk_map_io, + .map_io = da850_reference_map_io, .init_irq = cp_intc_init, .timer = &davinci_timer, .init_machine = omapl138_hawk_init, diff --git a/arch/arm/mach-davinci/da850-reference.c b/arch/arm/mach-davinci/da850-reference.c new file mode 100644 index 0000000..67b327b --- /dev/null +++ b/arch/arm/mach-davinci/da850-reference.c @@ -0,0 +1,15 @@ +/* + * TI DA850/OMAP-L138 reusable elements of the da850 reference design. + * + * Copyright (C) 2011 Nanometrics Inc. This file is licensed under + * the terms of the GNU General Public License version 2. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. + */ + +#include + +void __init da850_reference_map_io(void) +{ + da850_init(); +} diff --git a/arch/arm/mach-davinci/include/mach/da850-reference.h b/arch/arm/mach-davinci/include/mach/da850-reference.h new file mode 100644 index 0000000..d3beb13 --- /dev/null +++ b/arch/arm/mach-davinci/include/mach/da850-reference.h @@ -0,0 +1,14 @@ +/* Defines for the reusable elements of the da850 reference design. + * + * Copyright 2011 (c) Nanometrics Inc. This file is licensed under + * the terms of the GNU General Public License version 2. This program + * is licensed "as is" without any warranty of any kind, whether express + * or implied. + */ + +#ifndef __ASM_ARCH_DAVINCI_DA850_REFERENCE_H +#define __ASM_ARCH_DAVINCI_DA850_REFERENCE_H + +void __init da850_reference_map_io(void); + +#endif /* __ASM_ARCH_DAVINCI_DA850_REFERENCE_H */