From patchwork Fri Oct 4 07:47:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2987391 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 77BAB9F289 for ; Fri, 4 Oct 2013 07:48:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 72A882045E for ; Fri, 4 Oct 2013 07:48:01 +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 40CE020456 for ; Fri, 4 Oct 2013 07:48:00 +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 1VS078-0000J5-J6; Fri, 04 Oct 2013 07:47:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VS076-0003hK-05; Fri, 04 Oct 2013 07:47:52 +0000 Received: from perceval.ideasonboard.com ([95.142.166.194]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VS072-0003gs-Rf for linux-arm-kernel@lists.infradead.org; Fri, 04 Oct 2013 07:47:49 +0000 Received: from avalon.localnet (245.Red-176-80-171.dynamicIP.rima-tde.net [176.80.171.245]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 57A7A35A2D; Fri, 4 Oct 2013 09:46:55 +0200 (CEST) From: Laurent Pinchart To: Magnus Damm Subject: Re: [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Date: Fri, 04 Oct 2013 09:47:34 +0200 Message-ID: <19181221.pjTBb56TDE@avalon> User-Agent: KMail/4.10.5 (Linux/3.8.13-gentoo; KDE/4.10.5; x86_64; ; ) In-Reply-To: <20131001103255.813.65710.sendpatchset@w520> References: <20131001103255.813.65710.sendpatchset@w520> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131004_034749_109634_FA3D9D0F X-CRM114-Status: GOOD ( 23.48 ) X-Spam-Score: -2.6 (--) Cc: khilman@linaro.org, kuninori.morimoto.gx@renesas.com, arnd@arndb.de, linux-sh@vger.kernel.org, takasi-y@ops.dti.ne.jp, horms@verge.net.au, 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: , 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Hi Magnus, Thank you for the patches. On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote: > ARM: shmobile: KZM9D Multiplatform update > > [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS > [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform > [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference > support > [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB > [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS I've reviewed the patches and they look fine to me. Acked-by: Laurent Pinchart Does this call for the following patch on top of 05/05 ? From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 4 Oct 2013 09:44:34 +0200 Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible string The only system compatible string used for the KZM9D board is "renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference" compatible string. Signed-off-by: Laurent Pinchart --- arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 - 1 file changed, 1 deletion(-) > This series updates mach-shmobile and the KZM9D board code to propose > a way forward for future CCF-enabled multiplatform board support. > > With this series applied the following rules apply: > > - CONFIG_ARCH_MULTIPLATFORM=y is used to enable multiplatform > - CONFIG_ARCH_SHMOBILE_MULTI=y is used in case of multiplatform build > - CONFIG_ARCH SHMOBILE=y is used in case of legacy non-multiplatform build > - CONFIG_MACH_KZM9D=y enables KZM9D board support regardless of > multiplatform > - In case of multiplatform build board-kzm9d-reference.c is used > - In case of legacy non-multiplatform build board-kzm9d.c is used > - KZM9D reference can no longer be built for non-multiplatform > - CONFIG_MACH_KZM9D_REFERENCE actually no longer exists > - emev2-kzm9d-reference.dts has been removed, use emev2-kzm9d.dts instead > - The same emev2-kzm9d.dts is used regardless of kernel configuration > - emev2-kzm9d.dtb can be used with legacy non-multiplatform > - emev2-kzm9d.dtb can be used with multiplatform > > In practice the above means that legacy board code users can keep on using > existing emev2-kzm9d.dtb as-is, but when updating to multiplatform kernel > the DTB needs to be updated as well and from that point the DTB needs to > be updated whenever new hardware is added. > > The above seems pretty straight forward from my point of view, so I > propose that we follow the same style for future multiplatform board > support. > > Before merging this series I'd like to see Yoshii-san's CCF patches > for KZM9D and EMEV2 to be finalized and picked up. > > Signed-off-by: Magnus Damm > --- > > Written against renesas.git tag renesas-devel-20131001 and > [PATCH 00/10] ARM: shmobile: r8a7791 SoC and Koelsch update V2 > plus selected CCF patches from Yoshii-san. > > arch/arm/boot/dts/Makefile | 3 - > arch/arm/boot/dts/emev2-kzm9d-reference.dts | 57 --------------------- > arch/arm/boot/dts/emev2-kzm9d.dts | 33 +++++++++++++ > arch/arm/mach-shmobile/Kconfig | 22 --------- > arch/arm/mach-shmobile/Makefile | 5 +- > arch/arm/mach-shmobile/Makefile.boot | 1 > arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c index 054d8d5..d2c6466 100644 --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c @@ -34,7 +34,6 @@ static void __init kzm9d_add_standard_devices(void) static const char *kzm9d_boards_compat_dt[] __initdata = { "renesas,kzm9d", - "renesas,kzm9d-reference", NULL, };