From patchwork Tue Jul 2 23:09:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 2814871 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 3A75C9F755 for ; Tue, 2 Jul 2013 23:10:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 308DB20154 for ; Tue, 2 Jul 2013 23:10:15 +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 1C62120152 for ; Tue, 2 Jul 2013 23:10:14 +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 1Uu9i0-0001pj-DZ; Tue, 02 Jul 2013 23:10:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uu9hx-00055r-BG; Tue, 02 Jul 2013 23:10:01 +0000 Received: from [2a01:e35:139b:9f90:221:70ff:fe55:8f78] (helo=smtp.natisbad.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uu9ht-00055A-Hv for linux-arm-kernel@lists.infradead.org; Tue, 02 Jul 2013 23:09:58 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id 464CA2C0577; Wed, 3 Jul 2013 01:09:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1372806575; bh=Qj5sEy9aPoOIZnWYBNpURQcXYQLJpqvABS8etYT2rcE=; h=From:To:Cc:Subject:References:Date:In-Reply-To; b=BjXLpiaFz4JXMpRAFlxdiTcmkytWb0+TllNXag3xmzOR/OALQIjbodc0gOxSF0Zjz VOrlPf399tLm82PceRGH7Nc1wjQNzYc/+aVNwI8XwO/ORr3BG4C1dFeAGgdW0yO0dN XjiWJWMhFsLqRDQv43rJGJZGkHvxC0i6GVSBz5ik= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from small (localhost [127.0.0.1]) by smtp.natisbad.org (Postfix) with ESMTP id B74AF2C0244; Wed, 3 Jul 2013 01:09:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1372806559; bh=Qj5sEy9aPoOIZnWYBNpURQcXYQLJpqvABS8etYT2rcE=; h=From:To:Cc:Subject:References:Date:In-Reply-To; b=0deo+ZrujNMNXoYGCnvg4xYr8qdvsPujbw+xnFhN8JxK49L0p+wnZddX+S7h0IYP5 3go+Mefxi9tWAlXJMa6B0aeeaV/835G+gG2AcKl/2rz0ThNmhk6CmCWCCFd9J1tEgD DR/23NvxdZKpldAkNqyR4iVE5bK3KFam5ZowRzx4= From: arno@natisbad.org (Arnaud Ebalard) To: Sebastian Hesselbarth Subject: Re: [PATCH v6 5/7] ARM: kirkwood: remove redundant DT board files References: <1372762824-12202-1-git-send-email-sebastian.hesselbarth@gmail.com> <1372762824-12202-6-git-send-email-sebastian.hesselbarth@gmail.com> X-PGP-Key-URL: http://natisbad.org/arno@natisbad.org.asc X-Fingerprint: D3A5 B68A 839B 38A5 815A 781B B77C 0748 A7AE 341B X-Hashcash: 1:20:130702:linux-arm-kernel@lists.infradead.org::UcZA9gg84B+jAiCA:00000000000000000000000000bPb X-Hashcash: 1:20:130702:linux-kernel@vger.kernel.org::CpqbPwQEyWwohWPa:0000000000000000000000000000000001VU0 X-Hashcash: 1:20:130702:andrew@lunn.ch::RNBvSz1xEPZEsHFG:0001FJp X-Hashcash: 1:20:130702:thomas.petazzoni@free-electrons.com::6OWm2EOT7QamNhxH:000000000000000000000000001Vbd X-Hashcash: 1:20:130702:netdev@vger.kernel.org::itSLa3JpiSDgN84o:0000000000000000000000000000000000000001jzb X-Hashcash: 1:20:130702:linux@arm.linux.org.uk::Zw/WM1liEciGB21q:0000000000000000000000000000000000000002nCW X-Hashcash: 1:20:130702:jason@lakedaemon.net::O1UpPPJUUEkJLuiI:000000000000000000000000000000000000000004ikL X-Hashcash: 1:20:130702:gregory.clement@free-electrons.com::hxOh9JM7D0OpXmn8:0000000000000000000000000002p33 X-Hashcash: 1:20:130702:sebastian.hesselbarth@gmail.com::ByiXDE3wsgk3hHJT:000000000000000000000000000000AtOv Date: Wed, 03 Jul 2013 01:09:50 +0200 In-Reply-To: <1372762824-12202-6-git-send-email-sebastian.hesselbarth@gmail.com> (Sebastian Hesselbarth's message of "Tue, 2 Jul 2013 13:00:22 +0200") Message-ID: <87k3l8v9s1.fsf@natisbad.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130702_190958_175985_0164AAFF X-CRM114-Status: GOOD ( 11.92 ) X-Spam-Score: -1.2 (-) Cc: Thomas Petazzoni , Andrew Lunn , Russell King , Jason Cooper , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory CLEMENT , 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-Virus-Scanned: ClamAV using ClamSMTP Hi Sebastian, Sebastian Hesselbarth writes: > With DT support for mv643xx_eth board specific init for some boards now > is unneccessary. Remove those board files, Kconfig entries, and > corresponding entries in kirkwood_defconfig. Applying above your set an old quilt cleaning patch Jason asked at some point, it became empty except for arch/arm/mach_kirkwood/common.h in which some declarations were left behind. If this is correct, can you just merge the hunks below in your 5/7 in next round? AFAICT, only dnskw_init() remains, which matches the list of board-*.c files in arch/arm/mach_kirkwood/ (i.e. board-dt.c and board-dnskw.c). Cheers, a+ Signed-off-by: Arnaud Ebalard --- arch/arm/mach-kirkwood/common.h | 108 ---------------------------------------- 1 file changed, 108 deletions(-) diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 1c09f3f..1cbdd2b 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -57,26 +57,6 @@ void kirkwood_restart(char, const char *); void kirkwood_clk_init(void); /* board init functions for boards not fully converted to fdt */ -#ifdef CONFIG_MACH_DREAMPLUG_DT -void dreamplug_init(void); -#else -static inline void dreamplug_init(void) {}; -#endif -#ifdef CONFIG_MACH_GURUPLUG_DT -void guruplug_dt_init(void); -#else -static inline void guruplug_dt_init(void) {}; -#endif -#ifdef CONFIG_MACH_SHEEVAPLUG_DT -void sheevaplug_dt_init(void); -#else -static inline void sheevaplug_dt_init(void) {}; -#endif -#ifdef CONFIG_MACH_TS219_DT -void qnap_dt_ts219_init(void); -#else -static inline void qnap_dt_ts219_init(void) {}; -#endif #ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT void dnskw_init(void); @@ -84,94 +64,6 @@ void dnskw_init(void); static inline void dnskw_init(void) {}; #endif -#ifdef CONFIG_MACH_ICONNECT_DT -void iconnect_init(void); -#else -static inline void iconnect_init(void) {}; -#endif - -#ifdef CONFIG_MACH_IB62X0_DT -void ib62x0_init(void); -#else -static inline void ib62x0_init(void) {}; -#endif - -#ifdef CONFIG_MACH_DOCKSTAR_DT -void dockstar_dt_init(void); -#else -static inline void dockstar_dt_init(void) {}; -#endif - -#ifdef CONFIG_MACH_GOFLEXNET_DT -void goflexnet_init(void); -#else -static inline void goflexnet_init(void) {}; -#endif - -#ifdef CONFIG_MACH_LSXL_DT -void lsxl_init(void); -#else -static inline void lsxl_init(void) {}; -#endif - -#ifdef CONFIG_MACH_IOMEGA_IX2_200_DT -void iomega_ix2_200_init(void); -#else -static inline void iomega_ix2_200_init(void) {}; -#endif - -#ifdef CONFIG_MACH_KM_KIRKWOOD_DT -void km_kirkwood_init(void); -#else -static inline void km_kirkwood_init(void) {}; -#endif - -#ifdef CONFIG_MACH_DB88F628X_BP_DT -void db88f628x_init(void); -#else -static inline void db88f628x_init(void) {}; -#endif - -#ifdef CONFIG_MACH_MPLCEC4_DT -void mplcec4_init(void); -#else -static inline void mplcec4_init(void) {}; -#endif - -#if defined(CONFIG_MACH_INETSPACE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_MAX_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_LITE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_MINI_V2_DT) -void ns2_init(void); -#else -static inline void ns2_init(void) {}; -#endif - -#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT -void openblocks_a6_init(void); -#else -static inline void openblocks_a6_init(void) {}; -#endif - -#ifdef CONFIG_MACH_READYNAS_DT -void netgear_readynas_init(void); -#else -static inline void netgear_readynas_init(void) {}; -#endif - -#ifdef CONFIG_MACH_TOPKICK_DT -void usi_topkick_init(void); -#else -static inline void usi_topkick_init(void) {}; -#endif - -#ifdef CONFIG_MACH_CLOUDBOX_DT -void cloudbox_init(void); -#else -static inline void cloudbox_init(void) {}; -#endif - /* early init functions not converted to fdt yet */ char *kirkwood_id(void); void kirkwood_l2_init(void);