From patchwork Mon Jul 22 13:16:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2831483 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 C3398C0319 for ; Mon, 22 Jul 2013 16:17:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D3C9202B8 for ; Mon, 22 Jul 2013 16:17:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38524202BA for ; Mon, 22 Jul 2013 16:17:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932943Ab3GVQRQ (ORCPT ); Mon, 22 Jul 2013 12:17:16 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:61152 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933002Ab3GVQRL (ORCPT ); Mon, 22 Jul 2013 12:17:11 -0400 Received: from axis700.grange (dslb-178-009-251-173.pools.arcor-ip.net [178.9.251.173]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MFi3J-1UvY2r3r1x-00Ebrn; Mon, 22 Jul 2013 18:17:09 +0200 Received: from 6a.grange (unknown [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 16F6040BCB; Mon, 22 Jul 2013 15:16:22 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1V1FyP-0001NS-PI; Mon, 22 Jul 2013 15:16:21 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , Guennadi Liakhovetski Subject: [PATCH 3/6] ARM: shmobile: armadillo800eva-reference: add MMCIF and SDHI DT nodes Date: Mon, 22 Jul 2013 15:16:18 +0200 Message-Id: <1374498981-5263-4-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374498981-5263-1-git-send-email-g.liakhovetski@gmx.de> References: <1374498981-5263-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:ohvIpQSFkiCJQYtLkCg8MVreC95m3XELe5i38i/CjZC nQ00X0v82kAI0W0OUmfOo3dheTLsFBHnY5PkMRxsRzz6FhKKoF fODxKipthJBZGP/YiqcjUquhpE6Einug3OyzV9OdN6/hgxD3om QM/rBUM/iyWbIhyGBGLGRJXIeAQ9zxalqu+VO7X3iZdQCB1OLu +Ypv/Wp7PJThK1j0cBqc19ze3zUP/WJwfwL891IagrGdWMRpId FcFWuV87i0K07pv0Lp+x3swnHt7F+e5iVHTpAxjsTIu+gvSIps qsY3zcs7kXow/oI+79Ga1UKpThnP9kNrqB80qZQis1SEU//tny NVoyNzRWDPQcmnHD9qLj07sEKXRxz+zI/QvGcW3q4cCJj2mRWk BbPLSj25YqhvA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.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 Add MMCIF, SDHI0 and SDHI1 DT nodes to armadillo800eva-reference together with required regulators and pinctrl bindings. Signed-off-by: Guennadi Liakhovetski --- .../boot/dts/r8a7740-armadillo800eva-reference.dts | 83 ++++++++++++++++++++ arch/arm/boot/dts/r8a7740.dtsi | 33 ++++++++ 2 files changed, 116 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index 366f729..1acf1bd 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts @@ -49,6 +49,44 @@ gpios = <&pfc 177 GPIO_ACTIVE_HIGH>; }; }; + + vcc_sdhi0: regulator@1 { + compatible = "regulator-fixed"; + + regulator-name = "vcc-sdhi0"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&pfc 75 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vcc_sdhi1: regulator@2 { + compatible = "regulator-fixed"; + + regulator-name = "vcc-sdhi1"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&pfc 16 GPIO_ACTIVE_HIGH>; + 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 = <&pfc 74 GPIO_ACTIVE_HIGH>; + gpios = <&pfc 17 GPIO_ACTIVE_HIGH>; + states = <3300000 0 + 1800000 1>; + + enable-active-high; + }; }; &i2c0 { @@ -63,6 +101,36 @@ }; }; +&mmcif0 { + vmmc-supply = <®_3p3v>; + bus-width = <8>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + status = "okay"; +}; + +&sdhi0 { + vmmc-supply = <&vcc_sdhi0>; + vqmmc-supply = <&vccq_sdhi0>; + cap-power-off-card; + bus-width = <4>; + cd-gpios = <&pfc 167 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&sdhi0_pins>; + status = "okay"; +}; + +&sdhi1 { + vmmc-supply = <&vcc_sdhi1>; + cap-power-off-card; + bus-width = <4>; + cd-gpios = <&pfc 72 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&sdhi1_pins>; + status = "okay"; +}; + &pfc { pinctrl-0 = <&scifa1_pins>; pinctrl-names = "default"; @@ -76,4 +144,19 @@ renesas,groups = "intc_irq10"; renesas,function = "intc"; }; + + mmc0_pins: mmcif { + renesas,groups = "mmc0_data8_1", "mmc0_ctrl_1"; + renesas,function = "mmc0"; + }; + + sdhi0_pins: sdhi0 { + renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_wp"; + renesas,function = "sdhi0"; + }; + + sdhi1_pins: sdhi1 { + renesas,groups = "sdhi1_data4", "sdhi1_ctrl", "sdhi1_cd", "sdhi1_wp"; + renesas,function = "sdhi1"; + }; }; diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index 638ada2..1d112f9 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -235,6 +235,39 @@ 0 73 0x4>; }; + mmcif0: mmcif@e6bd0000 { + compatible = "renesas,sh-mmcif", "renesas,sh7372-mmcif"; + reg = <0xe6bd0000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 56 4 + 0 57 4>; + status = "disabled"; + }; + + sdhi0: sdhi@e6850000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xe6850000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 117 4 + 0 118 4 + 0 119 4>; + cap-sd-highspeed; + cap-sdio-irq; + status = "disabled"; + }; + + sdhi1: sdhi@e6860000 { + compatible = "renesas,r8a7740-sdhi"; + reg = <0xe6860000 0x100>; + interrupt-parent = <&gic>; + interrupts = <0 121 4 + 0 122 4 + 0 123 4>; + cap-sd-highspeed; + cap-sdio-irq; + status = "disabled"; + }; + pfc: pfc@e6050000 { compatible = "renesas,pfc-r8a7740"; reg = <0xe6050000 0x8000>,