From patchwork Tue Jul 9 05:43:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2825086 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E9FD19F756 for ; Tue, 9 Jul 2013 05:46:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 11D592011D for ; Tue, 9 Jul 2013 05:46:18 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F1E0220114 for ; Tue, 9 Jul 2013 05:46:16 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwQj5-0003bj-Ca; Tue, 09 Jul 2013 05:44:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwQip-0006if-Le; Tue, 09 Jul 2013 05:44:19 +0000 Received: from mail-pb0-x22b.google.com ([2607:f8b0:400e:c01::22b]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwQin-0006gD-5D for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2013 05:44:17 +0000 Received: by mail-pb0-f43.google.com with SMTP id md12so5112388pbc.16 for ; Mon, 08 Jul 2013 22:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=c+ndk+lXtToqiHohZ6YE54ZBIajWec10okSuG9oZlzE=; b=vVZMBJUPNVTf0/Y+c3U1Jv81/4FxEB2tjy/ZCxJJn7YtuJqbVOxxTr/eKb27Pqs6TP U7wC3xs4k9EggaAjMLhFAwYE9w8rRAUhkQRC8xpte2IB1nlcu4LNsyzJSgTgiJ/zJfnY i4NHP299XIBf/wS9YF+iCGegiqp7gqPybSDwUtoD+HqSNAr4sGIr7u44xgZ5ZQoQBU47 ovLbOQYCKdKVSclv3DTEHm/ERfZKvPEg0G2417zWDWJnM9AVkpOwyQYR4MeDihF5yPGy nt0JbL65UHpLrIlUmIqI3elkHhRcnkkqCXurez8FCRjvN6VGHtLUAgEDnrz6pzxC5kJZ oYyQ== X-Received: by 10.68.50.69 with SMTP id a5mr24797416pbo.122.1373348635570; Mon, 08 Jul 2013 22:43:55 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id te9sm11915720pab.6.2013.07.08.22.43.52 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Jul 2013 22:43:54 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 09 Jul 2013 14:43:59 +0900 Message-Id: <20130709054359.14007.23619.sendpatchset@w520> In-Reply-To: <20130709054331.14007.66068.sendpatchset@w520> References: <20130709054331.14007.66068.sendpatchset@w520> Subject: [PATCH 03/04] ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130709_014417_275786_24414013 X-CRM114-Status: GOOD ( 10.82 ) X-Spam-Score: -2.0 (--) Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, laurent.pinchart@ideasonboard.com, olof@lixom.net, shinya.kuribayashi.px@renesas.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Enable build of EMEV2 and KZM9D DT Reference in case of ARCH_MULTIPLATFORM and ARCH_SHMOBILE_MULTI. A weak symbol covers the case when the clock-emev2.c file is not built when COMMON_CLK=y. Signed-off-by: Magnus Damm --- arch/arm/boot/dts/Makefile | 1 + arch/arm/mach-shmobile/Kconfig | 15 +++++++++++++++ arch/arm/mach-shmobile/setup-emev2.c | 5 +++++ 3 files changed, 21 insertions(+) --- 0002/arch/arm/boot/dts/Makefile +++ work/arch/arm/boot/dts/Makefile 2013-07-09 13:10:52.000000000 +0900 @@ -171,6 +171,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm sh73a0-kzm9g-reference.dtb \ r8a73a4-ape6evm.dtb \ sh7372-mackerel.dtb +dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ socfpga_vt.dtb dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ --- 0004/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-07-09 13:03:45.000000000 +0900 @@ -17,6 +17,21 @@ if ARCH_SHMOBILE_MULTI comment "SH-Mobile System Type" +config ARCH_EMEV2 + bool "Emma Mobile EV2" + +comment "SH-Mobile Board Type" + +config MACH_KZM9D_REFERENCE + bool "KZM9D board - Reference Device Tree Implementation" + depends on ARCH_EMEV2 + select REGULATOR_FIXED_VOLTAGE if REGULATOR + ---help--- + Use reference implementation of KZM9D board support + which makes a greater use of device tree at the expense + of not supporting a number of devices. + + This is intended to aid developers endif if ARCH_SHMOBILE --- 0001/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-09 13:03:45.000000000 +0900 @@ -190,6 +190,11 @@ void __init emev2_add_standard_devices(v emev2_register_pmu(); } +void __init __weak emev2_clock_init(void) +{ + /* in case legacy clocks are disabled then do nothing */ +} + void __init emev2_init_delay(void) { shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */