From patchwork Thu Feb 13 08:26:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 3643601 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 79DDE9F1EE for ; Thu, 13 Feb 2014 08:26:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7201A2013A for ; Thu, 13 Feb 2014 08:26:41 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 613602011D for ; Thu, 13 Feb 2014 08:26:40 +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 1WDrcA-0004e2-Ei; Thu, 13 Feb 2014 08:25:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDrby-0006ID-5L; Thu, 13 Feb 2014 08:25:34 +0000 Received: from mail-pb0-x235.google.com ([2607:f8b0:400e:c01::235]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDrbq-0006Fy-Mf for linux-arm-kernel@lists.infradead.org; Thu, 13 Feb 2014 08:25:28 +0000 Received: by mail-pb0-f53.google.com with SMTP id md12so10408749pbc.26 for ; Thu, 13 Feb 2014 00:25:05 -0800 (PST) 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=iogA032dAnFfDBfCqkngBqz8QXrOJElNhOalFWYQvpY=; b=jXcG1+ytFizbtaf+GtZw27J9MRB5qq2BKw8/eCC27O0bK4oVnaowvqUaYuTznj7so5 Nw9smZ6e7RALyOIyJx0zonvqgM2KiKak4BLbnSaWsE72wg+D1lRNbC9NBf9A0QkxD8ht zH2chvEzpNxFKL3UtoIzrjXXYCua74B/A80dEhnhMJgJYt+xg0nU24ef64Cf+YUV19rR gAq4OEvA6VrmUSXaW8DufquZdB2y9rXCnYMz7rUaZzPkRezwhVNEM1YcCFji7ySglymp EUOMo74ado73hQjS78W30GJbnaTxec7hbavFjywwR/lGsK8mws06Lc8qVorQPkoEim9Q JYsQ== X-Received: by 10.68.4.232 with SMTP id n8mr289746pbn.114.1392279905221; Thu, 13 Feb 2014 00:25:05 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id vx10sm8913329pac.17.2014.02.13.00.25.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Feb 2014 00:25:03 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Thu, 13 Feb 2014 17:26:18 +0900 Message-Id: <20140213082618.30630.64196.sendpatchset@w520> In-Reply-To: <20140213082558.30630.93034.sendpatchset@w520> References: <20140213082558.30630.93034.sendpatchset@w520> Subject: [PATCH 02/03] ARM: shmobile: Remove KZM9D board code X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140213_032526_889109_C93D61B6 X-CRM114-Status: GOOD ( 16.73 ) X-Spam-Score: -2.0 (--) Cc: horms@verge.net.au, Magnus Damm , 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 Get rid of KZM9D board code written in C. This version of the C board code was used in the case of multiplatform, but these days DT can be used instead, so because of that simply get rid of the C code to simplify and save space. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Kconfig | 6 --- arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/board-kzm9d-reference.c | 47 ------------------------ arch/arm/mach-shmobile/include/mach/emev2.h | 8 ---- arch/arm/mach-shmobile/setup-emev2.c | 3 + arch/arm/mach-shmobile/smp-emev2.c | 1 6 files changed, 2 insertions(+), 64 deletions(-) --- 0010/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-02-05 18:27:53.000000000 +0900 @@ -48,12 +48,6 @@ config MACH_KOELSCH depends on ARCH_R8A7791 select MICREL_PHY if SH_ETH -config MACH_KZM9D - bool "KZM9D board" - depends on ARCH_EMEV2 - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SMSC911X - config MACH_LAGER bool "Lager board" depends on ARCH_R8A7790 --- 0010/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-02-05 18:27:53.000000000 +0900 @@ -57,7 +57,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779 ifdef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o -obj-$(CONFIG_MACH_KZM9D) += board-kzm9d-reference.o obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o else obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o --- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,47 +0,0 @@ -/* - * kzm9d board support - Reference DT implementation - * - * Copyright (C) 2013 Renesas Solutions Corp. - * Copyright (C) 2013 Magnus Damm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include -#include - -static void __init kzm9d_add_standard_devices(void) -{ - of_clk_init(NULL); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - -static const char *kzm9d_boards_compat_dt[] __initdata = { - "renesas,kzm9d", - "renesas,kzm9d-reference", - NULL, -}; - -DT_MACHINE_START(KZM9D_DT, "kzm9d") - .smp = smp_ops(emev2_smp_ops), - .map_io = emev2_map_io, - .init_early = emev2_init_delay, - .init_machine = kzm9d_add_standard_devices, - .init_late = shmobile_init_late, - .dt_compat = kzm9d_boards_compat_dt, -MACHINE_END --- 0010/arch/arm/mach-shmobile/include/mach/emev2.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,8 +0,0 @@ -#ifndef __ASM_EMEV2_H__ -#define __ASM_EMEV2_H__ - -extern void emev2_map_io(void); -extern void emev2_init_delay(void); -extern struct smp_operations emev2_smp_ops; - -#endif /* __ASM_EMEV2_H__ */ --- 0010/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-02-05 18:27:53.000000000 +0900 @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -59,6 +58,8 @@ static const char *emev2_boards_compat_d NULL, }; +extern struct smp_operations emev2_smp_ops; + DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") .smp = smp_ops(emev2_smp_ops), .map_io = emev2_map_io, --- 0001/arch/arm/mach-shmobile/smp-emev2.c +++ work/arch/arm/mach-shmobile/smp-emev2.c 2014-02-05 18:27:53.000000000 +0900 @@ -24,7 +24,6 @@ #include #include #include -#include #include #include