From patchwork Tue Jul 23 11:19:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2831949 Return-Path: X-Original-To: patchwork-linux-sh@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 553779F243 for ; Tue, 23 Jul 2013 11:19:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90AAC201F0 for ; Tue, 23 Jul 2013 11:19:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2EAD3201E9 for ; Tue, 23 Jul 2013 11:19:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757141Ab3GWLTN (ORCPT ); Tue, 23 Jul 2013 07:19:13 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:64004 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756733Ab3GWLTN (ORCPT ); Tue, 23 Jul 2013 07:19:13 -0400 Received: from axis700.grange (dslb-094-220-153-077.pools.arcor-ip.net [94.220.153.77]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Lr6Jj-1UWfaS3lzf-00eIld; Tue, 23 Jul 2013 13:19:08 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 72FDB40BB4; Tue, 23 Jul 2013 13:19:07 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 68DDD40BB3; Tue, 23 Jul 2013 13:19:07 +0200 (CEST) Date: Tue, 23 Jul 2013 13:19:07 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: Laurent Pinchart , Simon Horman , Magnus Damm Subject: [PATCH v2 1/2] ARM: shmobile: ape6evm-reference: switch PFC to DT Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:xFPlGpSS/EJD4JX5Kw5vHxgTm6SB5F0O3Z2IvaYEWKs 0DUfwRbzUaQvkJ3Z8HOt2eI9rZMZpWpgatG4f/N6p1e35+S2pF OK2E/Bj4jBrPatkLlU4OJCtsWJYsAeEHxMtJsLedGapy9G4XZ3 RRnDpnFNJwDxYBSom4XDCx8vrqZnTILD3tQy7ZGENYytyDEQuL gTcIApN/e/ksCglecFn090Wk2TfhPs9O4DAWGCsMFXb34kTbbG kWwS74X29i1NROIXCYLwZKpP85dxnvIbIVBkLXm/upWRetxw+3 truum9PMHkdcudDCfSS9kG5eXYtUYr8JVLIEeIwxcve+TViphO yDPjfwd9OAB6y1nldV/JmphpILZZzMHZ21BhP1fhV0xhH/jYl4 q3FpTAeTPz2ew== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 PFC pinctrl configuration can now be performed via DT. Update ape6evm-reference to use this. Signed-off-by: Guennadi Liakhovetski Acked-by: Laurent Pinchart --- v2: no change arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 10 ++++++++++ arch/arm/mach-shmobile/board-ape6evm-reference.c | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts index 6f4506e..bbd09d8 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts @@ -53,3 +53,13 @@ >; voltage-tolerance = <1>; /* 1% */ }; + +&pfc { + pinctrl-0 = <&scifa0_pins>; + pinctrl-names = "default"; + + scifa0_pins: scifa0 { + renesas,groups = "scifa0_data"; + renesas,function = "scifa0"; + }; +}; diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c index 46b41de..52cc5fa 100644 --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c @@ -29,12 +29,6 @@ #include #include -static const struct pinctrl_map ape6evm_pinctrl_map[] = { - /* SCIFA0 console */ - PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4", - "scifa0_data", "scifa0"), -}; - static void __init ape6evm_add_standard_devices(void) { @@ -52,9 +46,6 @@ static void __init ape6evm_add_standard_devices(void) clk_put(parent); clk_put(mp); - pinctrl_register_mappings(ape6evm_pinctrl_map, - ARRAY_SIZE(ape6evm_pinctrl_map)); - r8a73a4_pinmux_init(); r8a73a4_add_dt_devices(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0);