From patchwork Tue Mar 19 17:38:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2303331 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 607B3DFB79 for ; Tue, 19 Mar 2013 17:38:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757275Ab3CSRiz (ORCPT ); Tue, 19 Mar 2013 13:38:55 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:63022 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757097Ab3CSRiy (ORCPT ); Tue, 19 Mar 2013 13:38:54 -0400 Received: from axis700.grange (dslb-094-221-113-011.pools.arcor-ip.net [94.221.113.11]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MdoTN-1U45DS2e3J-00PeU3; Tue, 19 Mar 2013 18:38:51 +0100 Received: by axis700.grange (Postfix, from userid 1000) id 1BFA040BB4; Tue, 19 Mar 2013 18:38:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 1926A40BB3; Tue, 19 Mar 2013 18:38:51 +0100 (CET) Date: Tue, 19 Mar 2013 18:38:50 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: Simon Horman , Magnus Damm , Laurent Pinchart Subject: [PATCH] ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:1+y25QBX/9gSS589reAC04hJHK6cwD7iMSUx+7EvFav E/5YfVIfCDDiMJ8xBdlQtzKPTP0gLRsuCuctR+A7hBdELla7Xj kpkuYaGYiwGCd+1BctpILWVgq50oPg3KQbmlmd2pNXh5ehBUE/ l/tM32KGIDFwvypzMXB4RDzQ9fdoE1I7qhey/8Zd0QLfL2gpVf gYJwp7pZ9TWZxwdXFVIfu/wOtDwAmC0hGKunmBRdqPbHht2qkU v1OMuHNODaT8xjFDuJuwqvqxE9xjSKq7eepV9pBG0rXltAzaxf o3BRTQSJiORESJVbB8d2UwOelND73QaOR167a9VRWnDG9IaldD Srgc2hhsZ6aZAo65iOEnmvZsSvz6uqTphtD2WgYjt2W7rKuZkf RjfGpcyvRDPFA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Fix several device-tree bindings, that haven't been updated for newest versions of respective drivers, and device names and pin numbers, left over from non-DT and old pinctrl versions. Signed-off-by: Guennadi Liakhovetski Acked-by: Laurent Pinchart --- Applies on top of my previous patches from yesterday and today. In principle it would be better to first fix bugs and then move device tree nodes around, but the bugs are there also in the original version, so, doesn't really matter in which order we do fixing and transforming. Unless we want to merge fixes into original patches, that introduced the bugs. arch/arm/boot/dts/sh73a0.dtsi | 12 +++++----- arch/arm/mach-shmobile/board-kzm9g-reference.c | 27 +++++++++++------------ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi index c89be38..3e4d383 100644 --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi @@ -109,36 +109,36 @@ }; sdhi0: sdhi@0xee100000 { - compatible = "renesas,shmobile-sdhi"; + compatible = "renesas,r8a7740-sdhi"; reg = <0xee100000 0x100>; interrupt-parent = <&gic>; interrupts = <0 83 4 0 84 4 0 85 4>; - toshiba,mmc-has-idle-wait; + cap-sd-highspeed; status = "disabled"; }; /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */ sdhi1: sdhi@0xee120000 { - compatible = "renesas,shmobile-sdhi"; + compatible = "renesas,r8a7740-sdhi"; reg = <0xee120000 0x100>; interrupt-parent = <&gic>; interrupts = <0 88 4 0 89 4>; toshiba,mmc-wrprotect-disable; - toshiba,mmc-has-idle-wait; + cap-sd-highspeed; status = "disabled"; }; sdhi2: sdhi@0xee140000 { - compatible = "renesas,shmobile-sdhi"; + compatible = "renesas,r8a7740-sdhi"; reg = <0xee140000 0x100>; interrupt-parent = <&gic>; interrupts = <0 104 4 0 105 4>; toshiba,mmc-wrprotect-disable; - toshiba,mmc-has-idle-wait; + cap-sd-highspeed; status = "disabled"; }; }; diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c index b21e03f..100672c 100644 --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c @@ -81,16 +81,16 @@ static unsigned long pin_pullup_conf[] = { }; static const struct pinctrl_map kzm_pinctrl_map[] = { - PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("e6826000.i2c", "pfc-sh73a0", "i2c3_1", "i2c3"), /* MMCIF */ - PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0", "mmc0_data8_0", "mmc0"), - PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0", "mmc0_ctrl_0", "mmc0"), - PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mmcif.0", "pfc-sh73a0", + PIN_MAP_CONFIGS_PIN_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0", "PORT279", pin_pullup_conf), - PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0", + PIN_MAP_CONFIGS_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0", "mmc0_data8_0", pin_pullup_conf), /* SCIFA4 */ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0", @@ -98,18 +98,18 @@ static const struct pinctrl_map kzm_pinctrl_map[] = { PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0", "scifa4_ctrl", "scifa4"), /* SDHI0 */ - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0", "sdhi0_data4", "sdhi0"), - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0", "sdhi0_ctrl", "sdhi0"), - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0", "sdhi0_cd", "sdhi0"), - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0", "sdhi0_wp", "sdhi0"), /* SDHI2 */ - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0", "sdhi2_data4", "sdhi2"), - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0", + PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0", "sdhi2_ctrl", "sdhi2"), }; @@ -124,10 +124,9 @@ static void __init kzm_init(void) /* enable SD */ gpio_request(GPIO_FN_SDHI0_VCCQ_MC0_ON, NULL); - gpio_request_one(GPIO_PORT15, GPIOF_OUT_INIT_HIGH, NULL); /* power */ + gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */ - gpio_request(GPIO_FN_SDHICLK2, NULL); - gpio_request_one(GPIO_PORT14, GPIOF_OUT_INIT_HIGH, NULL); /* power */ + gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */ #ifdef CONFIG_CACHE_L2X0 /* Early BRESP enable, Shared attribute override enable, 64K*8way */