From patchwork Wed Jan 16 17:08:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1992321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 3C0D9DF2A2 for ; Wed, 16 Jan 2013 17:14:30 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TvWVs-0002PC-BI; Wed, 16 Jan 2013 17:10:56 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TvWTX-0001RA-IZ for linux-arm-kernel@lists.infradead.org; Wed, 16 Jan 2013 17:08:33 +0000 Received: from axis700.grange (dslb-178-006-255-053.pools.arcor-ip.net [178.6.255.53]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MI8h4-1Tw3dl0AWc-003Ui3; Wed, 16 Jan 2013 18:08:20 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 0F13140BC5; Wed, 16 Jan 2013 18:08:18 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1TvWTJ-0006pL-P4; Wed, 16 Jan 2013 18:08:17 +0100 From: Guennadi Liakhovetski To: Linus Walleij Subject: [PATCH 8/8] ARM: shmobile: completely switch MMC interfaces on armadillo800eva-reference to DT Date: Wed, 16 Jan 2013 18:08:17 +0100 Message-Id: <1358356097-26180-9-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1358356097-26180-1-git-send-email-g.liakhovetski@gmx.de> References: <1358356097-26180-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:++RSJm+Nbvz1FMZfOVWsFtckLNdG4XzVIf8vNZ9if3M J4rEU2aL2/5ozPb1TbPyWy1A/LJHq13jIZsBlEV2aqfB7xvkrG S9LALQT1AHZ7dsBOLur6++3476e9vL6adLhqSyHasmXRghS2OV C7mY/OYEzR2bqwbeO20a0ASs/FWlNfpdrumSLbb+TO6h+iRce2 3BDKEQbmW+af/vF/c/ulgG2hvv2BovwHZfORg1D0Te0T0f4dRz UIEV0wRwK5DEZTU7CHkEtImzIXRHgCqvSZfmJxQh7GrYGwo8Ec McCs281AoexMsqXx+2cYTrHRclakE0cdzt6xVY0SuU/Ob7RiKF vO3H14t0udiL8iwNTNMgmYbJypTozg9U8lvNld3Liz9YDbPcdV 7ZysvyI/A0jEQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130116_120831_903761_630A81F6 X-CRM114-Status: GOOD ( 10.83 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.9 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (g.liakhovetski[at]gmx.de) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Simon Horman , Magnus Damm , Laurent Pinchart , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Switch MMCIF, SDHI0 and SDHI1 to complete DT initialisation: use DT bindings to configure regulators, interface pins, card-detect GPIOs, various interface configuration parameters. Signed-off-by: Guennadi Liakhovetski --- .../boot/dts/r8a7740-armadillo800eva-reference.dts | 101 ++++++++++++++++++++ .../board-armadillo800eva-reference.c | 5 +- 2 files changed, 103 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index 319af9b..27774eb 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts @@ -30,4 +30,105 @@ sh-eth,register-type = "gigabit"; sh-eth,phy-id = <0>; }; + + reg_3p3v: regulator@0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + mmcif0: mmcif@0xe6bd0000 { + compatible = "renesas,sh-mmcif", "renesas,sh7372-mmcif"; + reg = <0xe6bd0000 0x100>; + interrupt-parent = <&intca>; + interrupts = <0x1ac0 0x1ae0>; + vmmc-supply = <®_3p3v>; + bus-width = <8>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + }; + + vcc_sdhi0: regulator@1 { + compatible = "regulator-fixed"; + + regulator-name = "vcc-sdhi0"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio 75 0>; + enable-active-high; + }; + + vcc_sdhi1: regulator@2 { + compatible = "regulator-fixed"; + + regulator-name = "vcc-sdhi1"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio 16 0>; + enable-active-high; + }; + + vccq_sdhi0: gpio-regulator@0 { + compatible = "regulator-gpio"; + + regulator-name = "vccq-sdhi0"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_sdhi0>; + + enable-gpio = <&gpio 74 0>; + gpios = <&gpio 17 0>; + states = <3300000 0 + 1800000 1>; + + enable-active-high; + }; + + sdhi0: sdhi@0xe6850000 { + compatible = "renesas,shmobile-sdhi"; + reg = <0xe6850000 0x100>; + interrupt-parent = <&intca>; + interrupts = <0xe20 0xe40>; + vmmc-supply = <&vcc_sdhi0>; + vqmmc-supply = <&vccq_sdhi0>; + bus-width = <4>; + cd-gpios = <&gpio 167 1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdhi0_pins>; + toshiba,mmc-has-idle-wait; + toshiba,mmc-cap-sdio-irq; + }; + + sdhi1: sdhi@0xe6860000 { + compatible = "renesas,shmobile-sdhi"; + reg = <0xe6860000 0x100>; + interrupt-parent = <&intca>; + interrupts = <0xea0 0xec0>; + vmmc-supply = <&vcc_sdhi1>; + bus-width = <4>; + cd-gpios = <&gpio 72 1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdhi1_pins>; + toshiba,mmc-has-idle-wait; + toshiba,mmc-cap-sdio-irq; + }; +}; + +&gpio { + sdhi0_pins: pfc_sdhi0_pins { + renesas,pins = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_wp"; + renesas,function = "sdhi0"; + }; + sdhi1_pins: pfc_sdhi1_pins { + renesas,pins = "sdhi1_data4", "sdhi1_ctrl", "sdhi1_wp"; + renesas,function = "sdhi1"; + }; + mmc0_pins: pfc_mmc0_pins { + renesas,pins = "mmc0_data8_1", "mmc0_ctrl_1"; + renesas,function = "mmc0"; + }; }; diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c index c206612..f929931 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c @@ -107,9 +107,10 @@ */ static void __init eva_init(void) { - r8a7740_pinmux_init(); r8a7740_meram_workaround(); + r8a7740_add_standard_devices_dt(); + /* SCIFA1 */ gpio_request(GPIO_FN_SCIFA1_RXD, NULL); gpio_request(GPIO_FN_SCIFA1_TXD, NULL); @@ -142,8 +143,6 @@ static void __init eva_init(void) /* Early BRESP enable, Shared attribute override enable, 32K*8way */ l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff); #endif - - r8a7740_add_standard_devices_dt(); } #define RESCNT2 IOMEM(0xe6188020)