From patchwork Fri Jul 19 15:30:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2830587 Return-Path: X-Original-To: patchwork-linux-sh@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 5E895C0319 for ; Fri, 19 Jul 2013 15:30:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 27B322033F for ; Fri, 19 Jul 2013 15:30:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81DBD202AE for ; Fri, 19 Jul 2013 15:30:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760778Ab3GSPaa (ORCPT ); Fri, 19 Jul 2013 11:30:30 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:51048 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760797Ab3GSPa0 (ORCPT ); Fri, 19 Jul 2013 11:30:26 -0400 Received: from axis700.grange (dslb-178-006-255-036.pools.arcor-ip.net [178.6.255.36]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0M0iEg-1U8uzT0ZgM-00uBE7; Fri, 19 Jul 2013 17:30:21 +0200 Received: by axis700.grange (Postfix, from userid 1000) id C1F2640BB4; Fri, 19 Jul 2013 17:30:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id B8DEC40BB3; Fri, 19 Jul 2013 17:30:20 +0200 (CEST) Date: Fri, 19 Jul 2013 17:30:20 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: Simon Horman , Magnus Damm Subject: [PATCH 1/2] ARM: shmobile: ape6evm-reference: switch PFC to DT Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:pjHXLPdx/lQl/AvWHWIwiD8jKCu/EJuxGg4MRyBiubf lRKyV4X/K6IU8dZgPNKyNwstaohtrJ0TLpfSlZm5E0STSQdC/5 tY+6gnDsAVYczZIJBUcfFDWXRYCakkkW4b9CI+ueoVbJszXZK7 Ug/Ulx5zpN8BDJc/FMB/sEHmNfSNUoUKE3ZXszwZjr0lQ2hCcp m/0yimn+C60N4az4++3IIzkWe3VF7sX35wkyFEO5D3jg065Gb6 hTUQ+k2p/LcSKPiha5aeZXYOndpilAsAbKMf9pQJL+zE0lNeqH QH/72FEahvcOwT6nX4HmgCgLbABR5oqOX2inisOf/AIQIo3QdS SzbFNzJFoMJLgjun/nF78Muw0sueA4mIZQpfPeS4NRPkT8GD6W 9rmJQQoWxNZaA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 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 --- 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);