From patchwork Fri Aug 9 09:48:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2841820 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 08ABE9F271 for ; Fri, 9 Aug 2013 09:49:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D08320499 for ; Fri, 9 Aug 2013 09:49:35 +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 28ABF20498 for ; Fri, 9 Aug 2013 09:49:34 +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 1V7jJQ-0002zk-KN; Fri, 09 Aug 2013 09:48:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jJC-00085S-3i; Fri, 09 Aug 2013 09:48:34 +0000 Received: from mail-pd0-x22e.google.com ([2607:f8b0:400e:c02::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7jJ9-00083L-PC for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2013 09:48:32 +0000 Received: by mail-pd0-f174.google.com with SMTP id y13so354244pdi.19 for ; Fri, 09 Aug 2013 02:48:10 -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=nEyJB+8NFBoMKrtLswvmhNXYSOPbCQ5BqXl2OBWWr1M=; b=PMizrn0fZ1ZFMH1pxHa5vaRs9vu99SEibLoz62IrJzWNzvXcJY/zRPYvR4ikD/7xyR WeVdokOmIyxRmcruIc18IROqWVUv3ooqoGuxPkrgHa5jL8SpcrCaOd4q4e1Ahst/FY/0 UqWExUxv7+oDB/zUA+XAoIerHIvqIR83RwTwOq6eUyuMm24ec6uS+1DL8PYJGknZ4YXx OQ1HYqRHiND1q+oN1u8NtARvPPRQ2QXixRNHU4sBgZLz05jeg+kRJMGTKiKMHWEckz/w Ph/ZoLsAKFtyixNg4IcJ8u7DgZ2APmVrfsJM9tCN+6dEPIcCNQnjPXP7EHBndkx9VnO9 2vPg== X-Received: by 10.68.237.3 with SMTP id uy3mr10544979pbc.155.1376041690359; Fri, 09 Aug 2013 02:48:10 -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 om2sm19174641pbc.30.2013.08.09.02.48.05 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 02:48:07 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Fri, 09 Aug 2013 18:48:19 +0900 Message-Id: <20130809094819.6530.79893.sendpatchset@w520> In-Reply-To: <20130809094748.6530.16511.sendpatchset@w520> References: <20130809094748.6530.16511.sendpatchset@w520> Subject: [PATCH 03/14] ARM: shmobile: sh7372: Remove ->init_machine() special case X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130809_054831_928787_1DCA7E2B X-CRM114-Status: UNSURE ( 8.51 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: olof@lixom.net, horms@verge.net.au, Magnus Damm , arnd@arndb.de, 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.1 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 No need to special case sh7372 ->init_machine(), so get rid of undesired clock setup from the generic long term sh7372 DT support code. Remove sh7372_add_standard_devices_dt() since we have no DT reference implementation for sh7372. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/include/mach/sh7372.h | 1 - arch/arm/mach-shmobile/setup-sh7372.c | 12 ------------ 2 files changed, 13 deletions(-) --- 0001/arch/arm/mach-shmobile/include/mach/sh7372.h +++ work/arch/arm/mach-shmobile/include/mach/sh7372.h 2013-08-08 15:45:46.000000000 +0900 @@ -64,7 +64,6 @@ extern void sh7372_earlytimer_init(void) extern void sh7372_add_early_devices(void); extern void sh7372_add_standard_devices(void); extern void sh7372_add_early_devices_dt(void); -extern void sh7372_add_standard_devices_dt(void); extern void sh7372_clock_init(void); extern void sh7372_pinmux_init(void); extern void sh7372_pm_init(void); --- 0001/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2013-08-08 15:44:20.000000000 +0900 @@ -1146,17 +1146,6 @@ void __init sh7372_add_early_devices_dt( shmobile_setup_console(); } -void __init sh7372_add_standard_devices_dt(void) -{ - /* clocks are setup late during boot in the case of DT */ - sh7372_clock_init(); - - platform_add_devices(sh7372_early_devices, - ARRAY_SIZE(sh7372_early_devices)); - - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - static const char *sh7372_boards_compat_dt[] __initdata = { "renesas,sh7372", NULL, @@ -1168,7 +1157,6 @@ DT_MACHINE_START(SH7372_DT, "Generic SH7 .nr_irqs = NR_IRQS_LEGACY, .init_irq = sh7372_init_irq, .handle_irq = shmobile_handle_irq_intc, - .init_machine = sh7372_add_standard_devices_dt, .dt_compat = sh7372_boards_compat_dt, MACHINE_END