linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 07/11] ARM: dts: alt: Enable UHS-I SDR-50 and SDR-104
Date: Fri, 16 Sep 2016 12:44:43 +0200	[thread overview]
Message-ID: <20160916104443.GA7566@verge.net.au> (raw)
In-Reply-To: <20160916102710.GJ1411@katana>

On Fri, Sep 16, 2016 at 12:27:10PM +0200, Wolfram Sang wrote:
> On Tue, Sep 13, 2016 at 12:57:04PM +0200, Simon Horman wrote:
> > Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,1}.
> > And the sd-uhs-sdr104 property to SDHI0.
> > 
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> If you drop sdr104 here for now as well:
> 
> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Thanks, done.

The result is as follows:

From: Simon Horman <horms+renesas@verge.net.au>
Date: Tue, 13 Sep 2016 12:57:04 +0200
Subject: [PATCH] ARM: dts: alt: enable UHS for SDHI 0 & 1

Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,1}.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-alt.dts | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 8d1b35afaf82..325d3f972c57 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -207,11 +207,25 @@
 	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>;
 	};
 };
 
@@ -255,23 +269,27 @@
 
 &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_LOW>;
+	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_LOW>;
+	sd-uhs-sdr50;
 	status = "okay";
 };
 
-- 
2.7.0.rc3.207.g0ac5344

  reply	other threads:[~2016-09-16 10:44 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-13 10:56 [PATCH v7 00/11] ARM, arm64: renesas: Enable UHS-I SDR-104 Simon Horman
2016-09-13 10:56 ` [PATCH v7 01/11] ARM: dts: lager: " Simon Horman
2016-09-13 10:56 ` [PATCH v7 02/11] arm64: dts: r8a7795: salvator-x: enable UHS for SDHI 0 & 3 Simon Horman
2016-09-16  9:55   ` Simon Horman
2016-09-16 10:22     ` Wolfram Sang
2016-09-13 10:57 ` [PATCH v7 03/11] arm64: dts: r8a7795: salvator-x: Enable UHS-I SDR-104 Simon Horman
2016-10-25 10:48   ` Geert Uytterhoeven
2016-11-07 12:32     ` Simon Horman
2016-09-13 10:57 ` [PATCH v7 04/11] ARM: dts: r8a7791: set maximum frequency for SDHI clocks Simon Horman
2016-09-16  9:53   ` Simon Horman
2016-09-13 10:57 ` [PATCH v7 05/11] ARM: dts: koelsch: Enable UHS-I SDR-50 and SDR-104 Simon Horman
2016-09-16 10:00   ` Simon Horman
2016-09-16 10:23     ` Wolfram Sang
2016-09-13 10:57 ` [PATCH v7 06/11] ARM: dts: r8a7794: set maximum frequency for SDHI clocks Simon Horman
2016-09-16 10:26   ` Wolfram Sang
2016-09-13 10:57 ` [PATCH v7 07/11] ARM: dts: alt: Enable UHS-I SDR-50 and SDR-104 Simon Horman
2016-09-16 10:27   ` Wolfram Sang
2016-09-16 10:44     ` Simon Horman [this message]
2016-09-13 10:57 ` [PATCH v7 08/11] arm64: dts: r8a7796: add SDHI nodes Simon Horman
2016-09-16 10:30   ` Wolfram Sang
2016-09-16 10:53     ` Simon Horman
2016-10-20  9:19       ` Simon Horman
2016-09-13 10:57 ` [PATCH v7 09/11] arm64: dts: r8a7796: salvator-x: enable SDHI0 & 3 Simon Horman
2016-09-16 10:32   ` Wolfram Sang
2016-10-20  9:19     ` Simon Horman
2016-09-13 10:57 ` [PATCH v7 10/11] arm64: dts: r8a7796: salvator-x: enable UHS for SDHI 0 " Simon Horman
2016-09-16 10:33   ` Wolfram Sang
2016-10-20  9:19     ` Simon Horman
2016-09-13 10:57 ` [PATCH v7 11/11] arm64: dts: r8a7796: salvator-x: Enable UHS-I SDR-104 Simon Horman
2016-10-25 10:49   ` Geert Uytterhoeven
2016-11-07 12:32     ` Simon Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160916104443.GA7566@verge.net.au \
    --to=horms@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).