From patchwork Mon Feb 22 04:35:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8371651 Return-Path: X-Original-To: patchwork-linux-mmc@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 88111C0553 for ; Mon, 22 Feb 2016 04:35:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 587C02039E for ; Mon, 22 Feb 2016 04:35:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55711203AB for ; Mon, 22 Feb 2016 04:35:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753188AbcBVEfl (ORCPT ); Sun, 21 Feb 2016 23:35:41 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:43422 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539AbcBVEfj (ORCPT ); Sun, 21 Feb 2016 23:35:39 -0500 Received: from reginn.isobedori.kobe.vergenet.net (p5023-ipbfp803kobeminato.hyogo.ocn.ne.jp [123.221.39.23]) by kirsty.vergenet.net (Postfix) with ESMTPA id AEAB025B7B0; Mon, 22 Feb 2016 15:35:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1456115736; bh=9HFlgDR+W1begZDlB7QYIV/YO7Kpy/KQ80WHOF+VWsk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ApT1C54n0jrYVOuVTT2aEDg5TQd+Kljq7dmoAyH6FIHwvU/OOfSQTGYdDHoHbuoOF lrLDJq5hmWh06ALafZo6rhCqZxiO+Dsx7CTj7gOcsaO6njUAazx6GVo9HvwfPD7eaM NEAkeOdrjtdRrxv4DevSuwgi79ZEMtS612Hx4uvc= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 5BC9894028E; Mon, 22 Feb 2016 13:35:30 +0900 (JST) Date: Mon, 22 Feb 2016 13:35:30 +0900 From: Simon Horman To: Wolfram Sang Cc: linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Dirk Behme , Ulf Hansson , Geert Uytterhoeven Subject: Re: [PATCH RESEND 3/3] arm64: dts: r8a7795: salvator-x: enable SDHI0 & 3 Message-ID: <20160222043530.GA16107@verge.net.au> References: <1455548510-1690-1-git-send-email-wsa@the-dreams.de> <1455548510-1690-4-git-send-email-wsa@the-dreams.de> <20160219175823.GA1392@katana> <20160222023910.GA19765@verge.net.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160222023910.GA19765@verge.net.au> Organisation: Horms Solutions Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 On Mon, Feb 22, 2016 at 11:39:12AM +0900, Simon Horman wrote: > On Fri, Feb 19, 2016 at 06:58:23PM +0100, Wolfram Sang wrote: > > On Mon, Feb 15, 2016 at 04:01:50PM +0100, Wolfram Sang wrote: > > > From: Ai Kyuse > > > > > > Add the exposed SD card slots. The on-board eMMC needs to wait until we > > > fixed the 8bit support (it works with 4bit if you really want it now). > > > > > > Signed-off-by: Ai Kyuse > > > Signed-off-by: Wolfram Sang > > > > Simon, if you apply this, can you drop the sentence inside the brackets? > > It is probably not true until I fix the timeout handling. Or do you want > > me to resend? > > > Sure, I have dropped the text in (). > > > I have queued up the following after resolving a minor conflict. > There was also some fuzz when I applied patch 2/2 so I'd appreciate it if > you could double check that too. There was a syntax error in my previous effort. Please look over this one instead. From: Ai Kyuse Date: Mon, 15 Feb 2016 16:01:50 +0100 Subject: [PATCH] arm64: dts: r8a7795: salvator-x: enable SDHI0 & 3 Add the exposed SD card slots. The on-board eMMC needs to wait until we fixed the 8bit support. Signed-off-by: Ai Kyuse Signed-off-by: Wolfram Sang Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 83 ++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index 31ace9c1f79d..1af67579e07a 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -33,6 +33,7 @@ /dts-v1/; #include "r8a7795.dtsi" +#include / { model = "Renesas Salvator-X board based on r8a7795"; @@ -61,6 +62,54 @@ clock-frequency = <24576000>; }; + vcc_sdhi0: regulator@1 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI0 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vccq_sdhi0: regulator@2 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI0 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; + + vcc_sdhi3: regulator@3 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI3 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio3 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + vccq_sdhi3: regulator@4 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI3 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; + audio_clkout: audio_clkout { /* * This is same as <&rcar_sound 0> @@ -119,6 +168,16 @@ renesas,function = "avb"; }; + sdhi0_pins: sd0 { + renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; + renesas,function = "sdhi0"; + }; + + sdhi3_pins: sd3 { + renesas,groups = "sdhi3_data4", "sdhi3_ctrl"; + renesas,function = "sdhi3"; + }; + sound_pins: sound { renesas,groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a"; renesas,function = "ssi"; @@ -228,6 +287,30 @@ status = "okay"; }; +&sdhi0 { + pinctrl-0 = <&sdhi0_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi0>; + vqmmc-supply = <&vccq_sdhi0>; + cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; + bus-width = <4>; + status = "okay"; +}; + +&sdhi3 { + pinctrl-0 = <&sdhi3_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi3>; + vqmmc-supply = <&vccq_sdhi3>; + cd-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>; + bus-width = <4>; + status = "okay"; +}; + &ssi1 { shared-pin; };