From patchwork Fri Sep 16 10:00:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9335357 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79BEE60839 for ; Fri, 16 Sep 2016 10:00:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AE1229F0D for ; Fri, 16 Sep 2016 10:00:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F80729F1C; Fri, 16 Sep 2016 10:00:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5B4E29F0D for ; Fri, 16 Sep 2016 10:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757081AbcIPKAi (ORCPT ); Fri, 16 Sep 2016 06:00:38 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:40716 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755788AbcIPKAi (ORCPT ); Fri, 16 Sep 2016 06:00:38 -0400 Received: from penelope.kanocho.kobe.vergenet.net (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 9981A25B791; Fri, 16 Sep 2016 20:00:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1474020035; bh=WkIU0kMmPKPg2aYaJKWNUTVQO4VEqAgfDtfU/5+fScE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rUA1PvZzbyj54znphETYVsQXNSh6fMKKgmYshO4o2zxUvJbIyp6J9cenSLBbjjN07 zWEmj55HPmyYZza5/WX6X9SK4PnV5k/w14OZf2rjskcf+z/mWp3ZOqw0Ft5jqI/8vK e2vvrfLfWiSbXSbRNl49CkTZCO7TTVWO9o2g40nI= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 0F68F6156C; Fri, 16 Sep 2016 12:00:32 +0200 (CEST) Date: Fri, 16 Sep 2016 12:00:32 +0200 From: Simon Horman To: Wolfram Sang , Ulf Hansson Cc: Magnus Damm , linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v7 05/11] ARM: dts: koelsch: Enable UHS-I SDR-50 and SDR-104 Message-ID: <20160916100031.GH14562@verge.net.au> References: <1473764228-24768-1-git-send-email-horms+renesas@verge.net.au> <1473764228-24768-6-git-send-email-horms+renesas@verge.net.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1473764228-24768-6-git-send-email-horms+renesas@verge.net.au> Organisation: Horms Solutions BV 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-Virus-Scanned: ClamAV using ClamSMTP On Tue, Sep 13, 2016 at 12:57:02PM +0200, Simon Horman wrote: > Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,1,2}. > And the sd-uhs-sdr104 property to SDHI0. > > Signed-off-by: Simon Horman As SDR50 support is present in the driver in mainline (correct me if I am wrong!) I have queued this up after dropping the sdr104 portion and updating the changelog accordingly. The result is as follows: From: Simon Horman Date: Tue, 13 Sep 2016 12:57:02 +0200 Subject: [PATCH] ARM: dts: koelsch: arm64: dts: r8a7795: salvator-x: enable UHS for SDHI 0, 1 & 3 Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,1,2}. Signed-off-by: Simon Horman Acked-by: Wolfram Sang --- arch/arm/boot/dts/r8a7791-koelsch.dts | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index f8a7d090fd01..f17bfa000f73 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -360,16 +360,37 @@ sdhi0_pins: sd0 { groups = "sdhi0_data4", "sdhi0_ctrl"; function = "sdhi0"; + power-source = <3300>; + }; + + sdhi0_pins_uhs: sd0_uhs { + groups = "sdhi0_data4", "sdhi0_ctrl"; + function = "sdhi0"; + power-source = <1800>; }; sdhi1_pins: sd1 { groups = "sdhi1_data4", "sdhi1_ctrl"; function = "sdhi1"; + power-source = <3300>; + }; + + sdhi1_pins_uhs: sd1_uhs { + groups = "sdhi1_data4", "sdhi1_ctrl"; + function = "sdhi1"; + power-source = <1800>; }; sdhi2_pins: sd2 { groups = "sdhi2_data4", "sdhi2_ctrl"; function = "sdhi2"; + power-source = <3300>; + }; + + sdhi2_pins_uhs: sd2_uhs { + groups = "sdhi2_data4", "sdhi2_ctrl"; + function = "sdhi2"; + power-source = <1800>; }; qspi_pins: qspi { @@ -454,33 +475,39 @@ &sdhi0 { pinctrl-0 = <&sdhi0_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdhi0_pins_uhs>; + pinctrl-names = "default", "state_uhs"; vmmc-supply = <&vcc_sdhi0>; vqmmc-supply = <&vccq_sdhi0>; cd-gpios = <&gpio6 6 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>; + sd-uhs-sdr50; status = "okay"; }; &sdhi1 { pinctrl-0 = <&sdhi1_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdhi1_pins_uhs>; + pinctrl-names = "default", "state_uhs"; vmmc-supply = <&vcc_sdhi1>; vqmmc-supply = <&vccq_sdhi1>; cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>; + sd-uhs-sdr50; status = "okay"; }; &sdhi2 { pinctrl-0 = <&sdhi2_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdhi2_pins_uhs>; + pinctrl-names = "default", "state_uhs"; vmmc-supply = <&vcc_sdhi2>; vqmmc-supply = <&vccq_sdhi2>; cd-gpios = <&gpio6 22 GPIO_ACTIVE_LOW>; + sd-uhs-sdr50; status = "okay"; };