From patchwork Wed Jul 17 20:31:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2828988 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 59F61C0AB2 for ; Wed, 17 Jul 2013 20:34:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44E95201E9 for ; Wed, 17 Jul 2013 20:34:25 +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 11BC4201E8 for ; Wed, 17 Jul 2013 20:34:23 +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 1UzYOf-0004UM-9A; Wed, 17 Jul 2013 20:32:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UzYO6-0007X7-UQ; Wed, 17 Jul 2013 20:31:50 +0000 Received: from mail-pd0-x235.google.com ([2607:f8b0:400e:c02::235]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UzYNp-0007Ta-W9 for linux-arm-kernel@lists.infradead.org; Wed, 17 Jul 2013 20:31:35 +0000 Received: by mail-pd0-f181.google.com with SMTP id 14so2241819pdj.12 for ; Wed, 17 Jul 2013 13:31:11 -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=l2Vv0vI36UjFXvZ0+sGxPdiqbHjssTwyy/anflDdzXw=; b=CZUvWORYt+kDSoP7l5XBuWW0VfvmOnsDMYC8BFJ8rBisJK9oICNAuc1tvTUDf2AVrG uM3qz8yDDvGCEtAvV+veN7JpOqUpNceQd3xasxbXNMKF2G/n8FXvrA6ShC96+6P76LK2 1GfCgBl5/gwLUApDU6vVW6Y2T1OnIVWrZX1nVABI7JryS6P+/OfATeSVJs5RRw+Sf2K9 D+70SZhIFDLZb0D0fXwP0r0yN3OmWNS9hl8GVQTHxfBsTk/d9gCPNmwt7j0RvxS1V2Aj 9htgy75ndkaEAF7X+O+4ZD2nEBheQmF/vQNB8zwEzKVHuN5tt8A4cIzM8qaQWCz/sCdX 2adg== X-Received: by 10.68.171.99 with SMTP id at3mr8739443pbc.64.1374093071755; Wed, 17 Jul 2013 13:31:11 -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 jb2sm9596777pbc.8.2013.07.17.13.31.09 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Jul 2013 13:31:10 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Thu, 18 Jul 2013 05:31:18 +0900 Message-Id: <20130717203118.27542.37940.sendpatchset@w520> In-Reply-To: <20130717203049.27542.78385.sendpatchset@w520> References: <20130717203049.27542.78385.sendpatchset@w520> Subject: [PATCH v2 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-20130717_163134_226572_5160D16F X-CRM114-Status: GOOD ( 11.72 ) 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.5 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. IS_ENABLED() is leaves the clock-emev2.c file out in case of COMMON_CLK=y. Signed-off-by: Magnus Damm --- Changes since V1: - use IS_ENABLED() instead of weak symbol, thanks Arnd! arch/arm/boot/dts/Makefile | 1 + arch/arm/mach-shmobile/Kconfig | 15 +++++++++++++++ arch/arm/mach-shmobile/board-kzm9d-reference.c | 3 ++- arch/arm/mach-shmobile/setup-emev2.c | 3 ++- 4 files changed, 20 insertions(+), 2 deletions(-) --- 0001/arch/arm/boot/dts/Makefile +++ work/arch/arm/boot/dts/Makefile 2013-07-18 05:06:46.000000000 +0900 @@ -195,6 +195,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm r8a73a4-ape6evm.dtb \ r8a73a4-ape6evm-reference.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 \ --- 0003/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-07-18 05:06:46.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/board-kzm9d-reference.c +++ work/arch/arm/mach-shmobile/board-kzm9d-reference.c 2013-07-18 05:12:08.000000000 +0900 @@ -26,7 +26,8 @@ static void __init kzm9d_add_standard_devices(void) { - emev2_clock_init(); + if (!IS_ENABLED(CONFIG_COMMON_CLK)) + emev2_clock_init(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } --- 0001/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-18 05:12:17.000000000 +0900 @@ -175,7 +175,8 @@ static struct resource pmu_resources[] = void __init emev2_add_standard_devices(void) { - emev2_clock_init(); + if (!IS_ENABLED(CONFIG_COMMON_CLK)) + emev2_clock_init(); emev2_register_uart(0); emev2_register_uart(1);