From patchwork Tue Oct 1 10:33:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2969351 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 39D2D9F245 for ; Tue, 1 Oct 2013 10:34:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BFEC2034D for ; Tue, 1 Oct 2013 10:34:53 +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 BBDAF2024A for ; Tue, 1 Oct 2013 10:34:51 +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 1VQxGu-0004Vk-Lc; Tue, 01 Oct 2013 10:33:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQxGd-0004iX-Jv; Tue, 01 Oct 2013 10:33:23 +0000 Received: from mail-pb0-x232.google.com ([2607:f8b0:400e:c01::232]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQxGa-0004eu-IS for linux-arm-kernel@lists.infradead.org; Tue, 01 Oct 2013 10:33:21 +0000 Received: by mail-pb0-f50.google.com with SMTP id uo5so6927013pbc.37 for ; Tue, 01 Oct 2013 03:32:59 -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=NyUS32FjuDMpSuPivOXxZRGU/MDM+nqCxrAI4AzX8pY=; b=nZawFQaX5e0uHYxXkh3bLQQ8MqA5oUAIbSljJuowM0FGroW/NU4lsnrye0GKUTFZhR 6KOqFpgCxzw56YwHoY9WPKqTOctzmsLJU+Mp55KPdOYIrhMjkVlcbGG8yvZK0TMaM0S5 oDNHsP/yUKv8DKm5TBAokuRROA2Y4JFw2CFmIYbQgW4RuPnI0XqSt4fn6goaNsS03GqR NXcB1jrX2m4Jrs0qN/vjrll2bpxbAAEHf6wVAKWrG5h2H4dPxxQQCxOjLpNugEDDXDEq w9TZp/YDnjbsAKKq3YsXom4YXNXxMvoPFMUpidKK3zXu8i4GVghmenv2anICiMgtBXqz /uMg== X-Received: by 10.66.154.197 with SMTP id vq5mr7981044pab.155.1380623579007; Tue, 01 Oct 2013 03:32:59 -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 nj9sm6037448pbc.13.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Oct 2013 03:32:58 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 01 Oct 2013 19:33:24 +0900 Message-Id: <20131001103324.813.82210.sendpatchset@w520> In-Reply-To: <20131001103255.813.65710.sendpatchset@w520> References: <20131001103255.813.65710.sendpatchset@w520> Subject: [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131001_063320_726368_A326C7C1 X-CRM114-Status: UNSURE ( 8.79 ) X-CRM114-Notice: Please train this message. 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 Now when CCF is supported remove the legacy KZM9D reference Kconfig bits CONFIG_MACH_KZM9D_REFERENCE for the non-multiplatform case. Starting from this commit KZM9D board support is always enabled via CONFIG_MACH_KZM9D, and CONFIG_ARCH_MULTIPLATFORM is used to select between board-kzm9d.c and board-kzm9d-reference.c The file board-kzm9d-reference.c can no longer be used together with the legacy sh-clk clock framework, instead CCF is used. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Kconfig | 12 ------------ arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/Makefile.boot | 1 - 3 files changed, 14 deletions(-) --- 0003/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-09-27 11:25:58.000000000 +0900 @@ -226,18 +226,6 @@ config MACH_KZM9D select REGULATOR_FIXED_VOLTAGE if REGULATOR select USE_OF -config MACH_KZM9D_REFERENCE - bool "KZM9D board - Reference Device Tree Implementation" - depends on ARCH_EMEV2 - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select USE_OF - ---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 - config MACH_KZM9G bool "KZM-A9-GT board" depends on ARCH_SH73A0 --- 0003/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2013-09-27 11:26:08.000000000 +0900 @@ -68,7 +68,6 @@ obj-$(CONFIG_MACH_ARMADILLO800EVA) += bo obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o -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 --- 0001/arch/arm/mach-shmobile/Makefile.boot +++ work/arch/arm/mach-shmobile/Makefile.boot 2013-09-27 11:26:16.000000000 +0900 @@ -8,7 +8,6 @@ loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 -loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000