From patchwork Wed Mar 16 17:11:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 8602811 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 656D5C0553 for ; Wed, 16 Mar 2016 17:12:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A927E20306 for ; Wed, 16 Mar 2016 17:12:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6732202FE for ; Wed, 16 Mar 2016 17:12:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933086AbcCPRLw (ORCPT ); Wed, 16 Mar 2016 13:11:52 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34880 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934654AbcCPRLp (ORCPT ); Wed, 16 Mar 2016 13:11:45 -0400 Received: by mail-wm0-f67.google.com with SMTP id l124so4363564wmf.2; Wed, 16 Mar 2016 10:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/W7NohFSWrbtLzMSeWyr/swHKz3I22DCrQPZUK8q9t8=; b=eCLpxTDfDlAkARTJ/RczTtVZv+NAyTbwa5Iq/ILLJmFBbWfry0Ht5+Y91kBqeyip6F h6d4GxINqUoms92ODe1JxuwHoWgmuEZxqVs9iuANrQTcGOnJluYnTaihUmdkdJ0FPnfj iB3An8bbvojRgBpwltQnApu3BrP/43Kwn1xYrz706k0zRoWPT4ILq5Sb6bhN5HmrhjZO I8PaCrokz/6jJpkGy7Voqyfz5poxz55c2hPot+K0n+bOIJ91hBQrCtzx+GgQ1u3T/xF/ 50CYOOc5jPoSNXKksDlgAVsYBJGYo2UEX7LMEaUc7bMlJssstNYIIn2M9ZOKSA4kzoNu zcQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/W7NohFSWrbtLzMSeWyr/swHKz3I22DCrQPZUK8q9t8=; b=d3m2yifd8QEj0cqrAPH0lROGSoWjHc2B6z/4J/GL10A5j0wfzP4gHG92U9oMx0qCzh MI6iyT0dxA7ip9OLVgzpx8KhMmzMd9Ah2ax2VMo6OQahC4Dxb2sJmQi/XVhH+pKo0KCt JBQiQStL1FTeYDe8epnanKeEvO5mvuQtckLKwe7KN3x+Na72c80mdrK1woLvA2BAlmkW vSVw+BS9TG6s/R0hrc5V3+778v7G/J3fdNWxYc2k+cd2husnYzO5OGcsiljeeHil7Nlu pND7YI7h/AumdMxhPGiSLjV9pkr/934bVKsXLQ1kX7f586q8NkWHGFO8k8RRafd810Gc UaRg== X-Gm-Message-State: AD7BkJJs0X5y+R6G12uJbbteW/6+Lw2JIF/b+XNESsa2TCQhyc5UAcHL4tiIyHiUUt7RdA== X-Received: by 10.28.15.211 with SMTP id 202mr29204485wmp.31.1458148303559; Wed, 16 Mar 2016 10:11:43 -0700 (PDT) Received: from groucho.site (ip9234e209.dynamic.kabel-deutschland.de. [146.52.226.9]) by smtp.gmail.com with ESMTPSA id za6sm3926931wjc.18.2016.03.16.10.11.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Mar 2016 10:11:43 -0700 (PDT) From: Ulrich Hecht To: horms@verge.net.au Cc: linux-renesas-soc@vger.kernel.org, linux-mmc@vger.kernel.org, magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH 2/2] ARM: dts: gose: Enable SDHI controllers Date: Wed, 16 Mar 2016 18:11:37 +0100 Message-Id: <1458148297-22159-3-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1458148297-22159-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1458148297-22159-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Includes regulator and pin assignments. Signed-off-by: Ulrich Hecht --- arch/arm/boot/dts/r8a7793-gose.dts | 119 +++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts index b7e8bd9..1ab3de4 100644 --- a/arch/arm/boot/dts/r8a7793-gose.dts +++ b/arch/arm/boot/dts/r8a7793-gose.dts @@ -158,6 +158,78 @@ }; }; + vcc_sdhi0: regulator@0 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI0 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio7 17 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vccq_sdhi0: regulator@1 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI0 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; + + vcc_sdhi1: regulator@2 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI1 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio7 18 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vccq_sdhi1: regulator@3 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI1 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; + + vcc_sdhi2: regulator@4 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI2 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio7 19 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vccq_sdhi2: regulator@5 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI2 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; + audio_clock: clock { compatible = "fixed-clock"; #clock-cells = <0>; @@ -274,6 +346,21 @@ renesas,function = "intc"; }; + sdhi0_pins: sd0 { + renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; + renesas,function = "sdhi0"; + }; + + sdhi1_pins: sd1 { + renesas,groups = "sdhi1_data4", "sdhi1_ctrl"; + renesas,function = "sdhi1"; + }; + + sdhi2_pins: sd2 { + renesas,groups = "sdhi2_data4", "sdhi2_ctrl"; + renesas,function = "sdhi2"; + }; + qspi_pins: spi0 { renesas,groups = "qspi_ctrl", "qspi_data4"; renesas,function = "qspi"; @@ -333,6 +420,38 @@ status = "okay"; }; +&sdhi0 { + pinctrl-0 = <&sdhi0_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi0>; + vqmmc-supply = <&vccq_sdhi0>; + cd-gpios = <&gpio6 6 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&sdhi1 { + pinctrl-0 = <&sdhi1_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi1>; + vqmmc-supply = <&vccq_sdhi1>; + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&sdhi2 { + pinctrl-0 = <&sdhi2_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi2>; + vqmmc-supply = <&vccq_sdhi2>; + cd-gpios = <&gpio6 22 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + &qspi { pinctrl-0 = <&qspi_pins>; pinctrl-names = "default";