From patchwork Tue Oct 1 10:33:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2969341 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 5C05A9F245 for ; Tue, 1 Oct 2013 10:34:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF69A2034D for ; Tue, 1 Oct 2013 10:34:16 +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 8B35C2024A for ; Tue, 1 Oct 2013 10:34:15 +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 1VQxGf-0004NE-Vx; Tue, 01 Oct 2013 10:33:26 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQxGU-0004hE-Oc; Tue, 01 Oct 2013 10:33:14 +0000 Received: from mail-pd0-x231.google.com ([2607:f8b0:400e:c02::231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQxGR-0004eB-8g for linux-arm-kernel@lists.infradead.org; Tue, 01 Oct 2013 10:33:12 +0000 Received: by mail-pd0-f177.google.com with SMTP id y10so6954914pdj.8 for ; Tue, 01 Oct 2013 03:32:49 -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=ukZAtFlVSBJ8yPifZRd3FjQLgyPhLKs9R6xBAc1HK4Y=; b=pxEzhSfpwHnYR3wbRZsfqG3HUJLUu7fVNHP34iX1lkxa3V0SFs/QxOYOn5D6aKHzbY CkB9RtoRxg04hz8nbGokXq5ZFu1ZExVBzVhNeZHWjk2d6Wcfba3/dDrspNrDFGTylpLh JRxbedWvAJXH2O6YkJ+1LD38SAhZuOwMc/UfeRHcX3DUpGwwmU2rwa076AFBZg41pSKD Yp3R8ouPNccCBVkYMPjucLmDJAhr98//Wt3Y6j/5ij3j3v7COPiqw1B3VdUGQ8yuvLtJ z0X1YM7Pwtpb3uiCqsi8KtUTD0Izy0EpMQ7a3e+Ipz1lIAfAxRh/b+OQ49aD1A21lzNm +RpQ== X-Received: by 10.68.40.169 with SMTP id y9mr780497pbk.193.1380623569591; Tue, 01 Oct 2013 03:32:49 -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 wp8sm6010079pbc.26.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Oct 2013 03:32:48 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 01 Oct 2013 19:33:15 +0900 Message-Id: <20131001103315.813.80581.sendpatchset@w520> In-Reply-To: <20131001103255.813.65710.sendpatchset@w520> References: <20131001103255.813.65710.sendpatchset@w520> Subject: [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131001_063311_465997_1E946EAD X-CRM114-Status: GOOD ( 10.47 ) X-Spam-Score: -2.0 (--) Cc: khilman@linaro.org, kuninori.morimoto.gx@renesas.com, arnd@arndb.de, Magnus Damm , takasi-y@ops.dti.ne.jp, horms@verge.net.au, laurent.pinchart@ideasonboard.com, olof@lixom.net, 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.7 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 Change the multiplatform kconfig bits for KZM9D from CONFIG_MACH_KZM9D_REFERENCE into CONFIG_MACH_KZM9D to match the non-multiplatform case. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Kconfig | 10 ++-------- arch/arm/mach-shmobile/Makefile | 4 ++++ 2 files changed, 6 insertions(+), 8 deletions(-) --- 0001/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-09-27 11:22:20.000000000 +0900 @@ -22,16 +22,10 @@ config ARCH_EMEV2 comment "SH-Mobile Board Type" -config MACH_KZM9D_REFERENCE - bool "KZM9D board - Reference Device Tree Implementation" +config MACH_KZM9D + bool "KZM9D board" 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 comment "SH-Mobile System Configuration" endif --- 0001/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2013-09-27 11:23:32.000000000 +0900 @@ -52,6 +52,9 @@ obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740 obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o # Board objects +ifdef CONFIG_ARCH_SHMOBILE_MULTI +obj-$(CONFIG_MACH_KZM9D) += board-kzm9d-reference.o +else obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o @@ -68,6 +71,7 @@ obj-$(CONFIG_MACH_KZM9D) += board-kzm9d. obj-$(CONFIG_MACH_KZM9D_REFERENCE) += board-kzm9d-reference.o obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o +endif # Framework support obj-$(CONFIG_SMP) += $(smp-y)