devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: horms@verge.net.au, linux-sh@vger.kernel.org, robh+dt@kernel.org,
	pawel.moll@arm.com, mark.rutland@arm.com,
	ijc+devicetree@hellion.org.uk, galak@codeaurora.org,
	devicetree@vger.kernel.org
Cc: magnus.damm@gmail.com, linux@arm.linux.org.uk,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: shmobile: silk: add SDHI0/1 DT support
Date: Sun, 22 Feb 2015 01:27:42 +0300	[thread overview]
Message-ID: <2348421.LHyZ4ZOiiG@wasted.cogentembedded.com> (raw)
In-Reply-To: <10037494.4LD4T2QGPX@wasted.cogentembedded.com>

Define the SILK board dependent parts of the SDHI0  (connected to SDIO Wi-Fi
chip)  and SDHI1  (connected to micro-SD slot) device nodes along with the
necessary voltage regulators.

Based on the original patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
 arch/arm/boot/dts/r8a7794-silk.dts |   81 +++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts
+++ renesas/arch/arm/boot/dts/r8a7794-silk.dts
@@ -12,6 +12,7 @@
 
 /dts-v1/;
 #include "r8a7794.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	model = "SILK";
@@ -39,6 +40,54 @@
 		regulator-boot-on;
 		regulator-always-on;
 	};
+
+	vcc_sdhi0: regulator@1 {
+		compatible = "regulator-fixed";
+
+		regulator-name = "SDHI0 Vcc";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+
+		gpio = <&gpio2 26 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 = <&gpio2 29 GPIO_ACTIVE_HIGH>;
+		gpios-states = <1>;
+		states = <3300000 1
+			  1800000 0>;
+	};
+
+	vcc_sdhi1: regulator@3 {
+		compatible = "regulator-fixed";
+
+		regulator-name = "SDHI1 Vcc";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+
+		gpio = <&gpio4 26 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+
+	vccq_sdhi1: regulator@4 {
+		compatible = "regulator-gpio";
+
+		regulator-name = "SDHI1 VccQ";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <3300000>;
+
+		gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;
+		gpios-states = <1>;
+		states = <3300000 1
+			  1800000 0>;
+	};
 };
 
 &extal_clk {
@@ -65,6 +114,16 @@
 		renesas,groups = "mmc_data8", "mmc_ctrl";
 		renesas,function = "mmc";
 	};
+
+	sdhi0_pins: sd0 {
+		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
+		renesas,function = "sdhi0";
+	};
+
+	sdhi1_pins: sd1 {
+		renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
+		renesas,function = "sdhi1";
+	};
 };
 
 &scif2 {
@@ -100,3 +159,25 @@
 	non-removable;
 	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_LOW>;
+	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_LOW>;
+	status = "okay";
+};


  parent reply	other threads:[~2015-02-21 22:27 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-21 22:25 [PATCH 0/2] Add R8A7794/SILK board SDHI DT support Sergei Shtylyov
2015-02-21 22:26 ` [PATCH 1/2] ARM: shmobile: r8a7794: add " Sergei Shtylyov
2015-02-23  0:28   ` Kuninori Morimoto
2015-02-23 11:18     ` Geert Uytterhoeven
     [not found]   ` <4571288.SFHfW35Ob9-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org>
2015-02-23 11:16     ` Geert Uytterhoeven
2015-02-23 22:00       ` Simon Horman
2015-02-21 22:27 ` Sergei Shtylyov [this message]
2015-02-22  0:45   ` [PATCH 2/2] ARM: shmobile: silk: add SDHI0/1 " Magnus Damm
2015-02-22 14:54     ` Sergei Shtylyov
2015-02-23 22:01       ` Simon Horman
2015-02-24  4:28       ` Magnus Damm
2015-08-10 22:44 ` [PATCH v2] ARM: shmobile: silk: add SDHI1 " Sergei Shtylyov
2015-08-12  1:26   ` Simon Horman
2015-08-21 20:57     ` Sergei Shtylyov
2015-08-21 22:18       ` Sergei Shtylyov
     [not found]         ` <55D7A3A1.9020009-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2015-09-02  2:29           ` Simon Horman
2015-09-04 23:47             ` Sergei Shtylyov
2015-09-18  0:21               ` Simon Horman
2015-09-18  2:56                 ` Magnus Damm
2015-09-22 23:19                   ` Sergei Shtylyov
     [not found]                     ` <5601E1F7.1060907-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2015-09-29  8:44                       ` Magnus Damm
2015-10-06 20:12                         ` Sergei Shtylyov
2015-09-22 23:22                 ` Sergei Shtylyov
     [not found]   ` <2757472.iuyUyRzJ3z-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org>
2015-08-13 22:47     ` Sergei Shtylyov
2015-10-16 21:37 ` Sergei Shtylyov
2015-10-18 11:04   ` Sergei Shtylyov
2015-10-19  0:46     ` Simon Horman
2015-10-20 17:58       ` Sergei Shtylyov
2015-10-21  0:31         ` Simon Horman
2015-10-21 18:13           ` Sergei Shtylyov
2015-10-22  0:54             ` Simon Horman
2015-10-21 23:04 ` [PATCH 1/2] ARM: shmobile: r8a7790: fix "gpio-ranges" props Sergei Shtylyov
2015-10-23  0:19   ` Simon Horman
2015-10-21 23:05 ` [PATCH 2/2] ARM: shmobile: r8a7791: " Sergei Shtylyov
     [not found]   ` <5904216.pOYUtEytKc-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org>
2015-10-22 11:06     ` Geert Uytterhoeven
2015-10-23  0:20       ` 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=2348421.LHyZ4ZOiiG@wasted.cogentembedded.com \
    --to=sergei.shtylyov@cogentembedded.com \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=horms@verge.net.au \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=magnus.damm@gmail.com \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.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).