From patchwork Mon Feb 24 05:49:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 3706321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 981A5BF13A for ; Mon, 24 Feb 2014 05:48:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C292420171 for ; Mon, 24 Feb 2014 05:48:21 +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 DCCF520160 for ; Mon, 24 Feb 2014 05:48:20 +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 1WHoOn-0005jS-Fs; Mon, 24 Feb 2014 05:48:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHoOl-00088Y-2g; Mon, 24 Feb 2014 05:48:15 +0000 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHoOh-000880-48 for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2014 05:48:11 +0000 Received: by mail-pa0-f48.google.com with SMTP id kx10so6057991pab.7 for ; Sun, 23 Feb 2014 21:47:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=T+gwCXVS9jwqdW1x1gnYBpdDUljOiiVJg0Qk+U3EG1s=; b=Vc/MEI8vl/SMUuoid6ERN58zkK0KxPxwpl/JPaEQ3AZ//vQO5ZkxcacaFGMAuZZgbS Ie+u1LT9ULzjF8QOHzG9DlipdtpL4wJqL15p8470vlmmcOYWBPj//ivx48PyzmUYHfwd 9c6l4dD/DEfMZ2UZ79uapcCjHAJMd5DDdaYIHHlEEnEqTdrAkGzVJ8F58qZVL5AVHwuO eV7wFtO+1ub2Dz2YnbLmDuy5H6WoIYG/gLK6i8puXq8uGi/HWm8eXLsaoN17qFK6gqFc 3WDca9f9WZU4kt5SK41iG+pZYK/SY8yv/Q493DtbECi6AtYC1P2ANhMxNXGEYYIOosJO Y2aQ== X-Received: by 10.68.201.97 with SMTP id jz1mr11717198pbc.26.1393220869631; Sun, 23 Feb 2014 21:47:49 -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 ou9sm1211071pbc.30.2014.02.23.21.47.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Feb 2014 21:47:48 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Mon, 24 Feb 2014 14:49:07 +0900 Message-Id: <20140224054907.1803.88038.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: Make use of r8a7790_add_standard_devices() X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140224_004811_265698_5B897D1C X-CRM114-Status: UNSURE ( 7.19 ) X-CRM114-Notice: Please train this message. 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.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=ham 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 Move non-PFC and non-GPIO devices off from r8a7790_pinmux_init() and into r8a7790_add_standard_devices() which is the normal place to keep regular devices in the legacy case. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- 0009/arch/arm/mach-shmobile/setup-r8a7790.c +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-02-24 14:15:51.000000000 +0900 @@ -185,12 +185,6 @@ void __init r8a7790_pinmux_init(void) r8a7790_register_gpio(3); r8a7790_register_gpio(4); r8a7790_register_gpio(5); - r8a7790_register_i2c(0); - r8a7790_register_i2c(1); - r8a7790_register_i2c(2); - r8a7790_register_i2c(3); - r8a7790_register_audio_dmac(0); - r8a7790_register_audio_dmac(1); } #define __R8A7790_SCIF(scif_type, _scscr, index, baseaddr, irq) \ @@ -308,6 +302,12 @@ void __init r8a7790_add_standard_devices r8a7790_add_dt_devices(); r8a7790_register_irqc(0); r8a7790_register_thermal(); + r8a7790_register_i2c(0); + r8a7790_register_i2c(1); + r8a7790_register_i2c(2); + r8a7790_register_i2c(3); + r8a7790_register_audio_dmac(0); + r8a7790_register_audio_dmac(1); } void __init r8a7790_init_early(void)