From patchwork Thu Aug 18 21:50:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 1078042 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 p7ILqcGW025235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Aug 2011 21:52:59 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuAVg-0004xW-Jf; Thu, 18 Aug 2011 21:52:21 +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 1QuAVf-00027c-PA; Thu, 18 Aug 2011 21:52:19 +0000 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1QuAUR-0001pu-Fb for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2011 21:51:05 +0000 Received: from mail-yw0-f49.google.com ([209.85.213.49]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKTk2JRTufYfHBKDxPFf7f48N+e/TJHVRk@postini.com; Thu, 18 Aug 2011 14:51:03 PDT Received: by mail-yw0-f49.google.com with SMTP id 17so2464814ywp.22 for ; Thu, 18 Aug 2011 14:51:00 -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=UwSslrhLB+fsPEDbU3p2K4bRyt81y9diaMn8x4pef4I=; b=FeZvduahaKlMJPyNDm84/cXx8kil1LmI0Z7aepmdZJurBLDtwrcGmWrj2aP5AWpb+y evp/FEJAhYo4+Y6h9wIdyY5nQNIVU6Sid4Cp5Jel6ftH48z/XDhU/bhROZ79axolwGpd ntXG3YLVTtSwpnZe3bXcPPaYXc6Q7OdrYHc6g= Received: by 10.236.176.39 with SMTP id a27mr1650474yhm.37.1313704260556; Thu, 18 Aug 2011 14:51:00 -0700 (PDT) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id s62sm2485298yhn.19.2011.08.18.14.50.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Aug 2011 14:51:00 -0700 (PDT) From: Ben Gardiner To: Sekhar Nori , davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 5/5] ARM: davinci: da850, omapl138: introduce new board-omapl138-heliosv1 Date: Thu, 18 Aug 2011 17:50:51 -0400 Message-Id: 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_175103_785758_86FB7B0E X-CRM114-Status: GOOD ( 18.13 ) 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.201 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:59 +0000 (UTC) Add support for the Nanometrics Helios Platform V1 Hardware. Initially support includes only serial console and watchdog support. Signed-off-by: Ben Gardiner Reviewed-by: James Nuss --- arch/arm/mach-davinci/Kconfig | 9 ++++ arch/arm/mach-davinci/Makefile | 1 + arch/arm/mach-davinci/board-omapl138-heliosv1.c | 51 +++++++++++++++++++++++ 3 files changed, 61 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-davinci/board-omapl138-heliosv1.c diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index c0deaca..21a8ce9 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -224,6 +224,15 @@ config MACH_OMAPL138_HAWKBOARD Information of this board may be found at http://www.hawkboard.org/ +config MACH_HELIOS_V1 + bool "Nanometrics OMAPL-138 Helios V1 platform" + depends on ARCH_DAVINCI_DA850 + help + Say Y here to select the Nanometrics OMAPL-138 Helios V1 platform. + This is a development system based on the DA850 EVM baseboard. + It is the first Helios hardware platform upon which other platforms in the + Helios product family are based. + config DAVINCI_MUX bool "DAVINCI multiplexing support" depends on ARCH_DAVINCI diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 9a01441..96d74c9 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_MACH_DAVINCI_DA850_EVM) += board-da850-evm.o obj-$(CONFIG_MACH_TNETV107X) += board-tnetv107x-evm.o obj-$(CONFIG_MACH_MITYOMAPL138) += board-mityomapl138.o obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD) += board-omapl138-hawk.o +obj-$(CONFIG_MACH_HELIOS_V1) += board-omapl138-heliosv1.o # Power Management obj-$(CONFIG_CPU_FREQ) += cpufreq.o diff --git a/arch/arm/mach-davinci/board-omapl138-heliosv1.c b/arch/arm/mach-davinci/board-omapl138-heliosv1.c new file mode 100644 index 0000000..73cc0a9 --- /dev/null +++ b/arch/arm/mach-davinci/board-omapl138-heliosv1.c @@ -0,0 +1,51 @@ +/* + * Nanometrics OMAPL-138 Helios V1 platform. + * + * 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 +#include +#include +#include + +#include +#include + +#include +#include +#include + +static __init void helios_v1_init(void) +{ + int ret; + + da850_reference_serial_init(); + + ret = da8xx_register_watchdog(); + if (ret) + pr_warning("%s: watchdog registration failed: %d\n", + __func__, ret); +} + +#ifdef CONFIG_SERIAL_8250_CONSOLE +static int __init helios_v1_console_init(void) +{ + if (!machine_is_helios_v1()) + return 0; + + return da850_reference_add_preferred_console(); +} +console_initcall(helios_v1_console_init); +#endif + +MACHINE_START(HELIOS_V1, "Nanometrics OMAPL-138 Helios V1 platform") + .boot_params = DA850_REFERENCE_BOOT_PARAMS, + .map_io = da850_reference_map_io, + .init_irq = cp_intc_init, + .timer = &davinci_timer, + .init_machine = helios_v1_init, +MACHINE_END