diff mbox

[v2] ARM: shmobile: silk: add SDHI1 DT support

Message ID 2544073.SzFGJq3XZ1@wasted.cogentembedded.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sergei Shtylyov Oct. 16, 2015, 9:37 p.m. UTC
Define the SILK board dependent part of the 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>

---
This patch is against 'renesas-devel-20151015-v4.3-rc5' tag of Simon Horman's
'renesas.git' repo.

Changes in version 3:
- removed the "disable-wp" property;
- added empty line before the regulator nodes;
- reformatted the changelog;
- refreshed the patch.

Changes in version 2:
- removed non-working SDHI0 stuff, renamed the patch;
- replaced SDHI1's "wp-gpios" property with "disable-wp".

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

Comments

Sergei Shtylyov Oct. 18, 2015, 11:04 a.m. UTC | #1
There should have been [PATCH v3] in the subject, of course.
Simon Horman Oct. 19, 2015, 12:46 a.m. UTC | #2
On Sun, Oct 18, 2015 at 02:04:53PM +0300, Sergei Shtylyov wrote:
> There should have been [PATCH v3] in the subject, of course.

Thanks for following up.

I have queued this up for v4.5.
Sergei Shtylyov Oct. 20, 2015, 5:58 p.m. UTC | #3
Hello.

On 10/19/2015 03:46 AM, Simon Horman wrote:

>> There should have been [PATCH v3] in the subject, of course.
>
> Thanks for following up.
>
> I have queued this up for v4.5.

    Again, not seeing anything new today from renesas.git...

MBR, Sergei
Simon Horman Oct. 21, 2015, 12:31 a.m. UTC | #4
On Tue, Oct 20, 2015 at 08:58:20PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 10/19/2015 03:46 AM, Simon Horman wrote:
> 
> >>There should have been [PATCH v3] in the subject, of course.
> >
> >Thanks for following up.
> >
> >I have queued this up for v4.5.
> 
>    Again, not seeing anything new today from renesas.git...

Thanks for noticing, it should be there now.
Sergei Shtylyov Oct. 21, 2015, 6:13 p.m. UTC | #5
On 10/21/2015 03:31 AM, Simon Horman wrote:

>>>> There should have been [PATCH v3] in the subject, of course.
>>>
>>> Thanks for following up.
>>>
>>> I have queued this up for v4.5.
>>
>>     Again, not seeing anything new today from renesas.git...
>
> Thanks for noticing, it should be there now.

    Hm, again nothing... :-(

MBR, Sergei
Simon Horman Oct. 22, 2015, 12:54 a.m. UTC | #6
On Wed, Oct 21, 2015 at 09:13:02PM +0300, Sergei Shtylyov wrote:
> On 10/21/2015 03:31 AM, Simon Horman wrote:
> 
> >>>>There should have been [PATCH v3] in the subject, of course.
> >>>
> >>>Thanks for following up.
> >>>
> >>>I have queued this up for v4.5.
> >>
> >>    Again, not seeing anything new today from renesas.git...
> >
> >Thanks for noticing, it should be there now.
> 
>    Hm, again nothing... :-(

Sorry, third time lucky.

https://git.kernel.org/cgit/linux/kernel/git/horms/renesas.git/tag/?id=renesas-devel-20151021-v4.3-rc6
diff mbox

Patch

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,30 @@ 
 		regulator-boot-on;
 		regulator-always-on;
 	};
+
+	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 {
@@ -71,6 +96,11 @@ 
 		renesas,function = "mmc";
 	};
 
+	sdhi1_pins: sd1 {
+		renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
+		renesas,function = "sdhi1";
+	};
+
 	qspi_pins: spi0 {
 		renesas,groups = "qspi_ctrl", "qspi_data4";
 		renesas,function = "qspi";
@@ -147,6 +177,16 @@ 
 	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>;
+	status = "okay";
+};
+
 &qspi {
 	pinctrl-0 = <&qspi_pins>;
 	pinctrl-names = "default";