[PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[Sergei Shtylyov]

Define the Porter board dependent part of the SDHI0/2 device nodes along with
the  necessary  voltage regulators (note that the Vcc regulators are dummy --
they are required but don't actually exist on the board). Also, GPIOs have to
be used for the CD and WP signals due to the SDHI driver constraints...

This patch is analogous to the commit 1299df03d719 (ARM: shmobile: henninger:
add SDHI0/2 DT support) as there  are no differences between those boards in
this respect.

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

---
This patch is against the 'renesas-devel-20151006-v4.3-rc4' tag of Simon
Horman's 'renesas.git' repo.

 arch/arm/boot/dts/r8a7791-porter.dts |   76 +++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

Index: renesas/arch/arm/boot/dts/r8a7791-porter.dts
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts
+++ renesas/arch/arm/boot/dts/r8a7791-porter.dts
@@ -10,6 +10,7 @@
 
 /dts-v1/;
 #include "r8a7791.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	model = "Porter";
@@ -33,6 +34,50 @@
 		device_type = "memory";
 		reg = <2 0x00000000 0 0x40000000>;
 	};
+
+	vcc_sdhi0: regulator@0 {
+		compatible = "regulator-fixed";
+
+		regulator-name = "SDHI0 Vcc";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+
+	vccq_sdhi0: regulator@1 {
+		compatible = "regulator-gpio";
+
+		regulator-name = "SDHI0 VccQ";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <3300000>;
+
+		gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+		gpios-states = <1>;
+		states = <3300000 1
+			  1800000 0>;
+	};
+
+	vcc_sdhi2: regulator@2 {
+		compatible = "regulator-fixed";
+
+		regulator-name = "SDHI2 Vcc";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+
+	vccq_sdhi2: regulator@3 {
+		compatible = "regulator-gpio";
+
+		regulator-name = "SDHI2 VccQ";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <3300000>;
+
+		gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
+		gpios-states = <1>;
+		states = <3300000 1
+			  1800000 0>;
+	};
 };
 
 &extal_clk {
@@ -54,6 +99,16 @@
 		renesas,groups = "intc_irq0";
 		renesas,function = "intc";
 	};
+
+	sdhi0_pins: sd0 {
+		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
+		renesas,function = "sdhi0";
+	};
+
+	sdhi2_pins: sd2 {
+		renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
+		renesas,function = "sdhi2";
+	};
 };
 
 &scif0 {
@@ -78,3 +133,24 @@
 		micrel,led-mode = <1>;
 	};
 };
+
+&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_HIGH>;
+	status = "okay";
+};
+
+&sdhi2 {
+	pinctrl-0 = <&sdhi2_pins>;
+	pinctrl-names = "default";
+
+	vmmc-supply = <&vcc_sdhi2>;
+	vqmmc-supply = <&vccq_sdhi2>;
+	cd-gpios = <&gpio6 22 GPIO_ACTIVE_LOW>;
+	status = "okay";
+};

Re: [PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[Simon Horman]

On Wed, Oct 07, 2015 at 02:05:41AM +0300, Sergei Shtylyov wrote:
> Define the Porter board dependent part of the SDHI0/2 device nodes along with
> the  necessary  voltage regulators (note that the Vcc regulators are dummy --
> they are required but don't actually exist on the board). Also, GPIOs have to
> be used for the CD and WP signals due to the SDHI driver constraints...
> 
> This patch is analogous to the commit 1299df03d719 (ARM: shmobile: henninger:
> add SDHI0/2 DT support) as there  are no differences between those boards in
> this respect.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
> This patch is against the 'renesas-devel-20151006-v4.3-rc4' tag of Simon
> Horman's 'renesas.git' repo.

Thanks I have queued this up after addressing some issues
in the changelog that checkpatch complained about:

* text > 75 characters wide
* Missing '"' around name of patch referred to

Its looking like there is already quite a log shared between
r8a7791-porter.dts and r8a7791-henninger.dts. Do you have any
thoughts on consolidating or sharing common elements between
them somehow?

Re: [PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[Sergei Shtylyov]

Hello.

On 10/7/2015 6:39 AM, Simon Horman wrote:

>> Define the Porter board dependent part of the SDHI0/2 device nodes along with
>> the  necessary  voltage regulators (note that the Vcc regulators are dummy --
>> they are required but don't actually exist on the board). Also, GPIOs have to
>> be used for the CD and WP signals due to the SDHI driver constraints...
>>
>> This patch is analogous to the commit 1299df03d719 (ARM: shmobile: henninger:
>> add SDHI0/2 DT support) as there  are no differences between those boards in
>> this respect.
>>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>
>> ---
>> This patch is against the 'renesas-devel-20151006-v4.3-rc4' tag of Simon
>> Horman's 'renesas.git' repo.
>
> Thanks I have queued this up after addressing some issues
> in the changelog that checkpatch complained about:
>
> * text > 75 characters wide
> * Missing '"' around name of patch referred to
>
> Its looking like there is already quite a log shared between

    Lot?

> r8a7791-porter.dts and r8a7791-henninger.dts. Do you have any
> thoughts on consolidating or sharing common elements between
> them somehow?

    I'm still planning to remove the Henninger's .dts for good. It was never 
sold and so had no users outside Renesas (and Cogent Embedded), I was told.

MBR, Sergei

Re: [PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[Simon Horman]

On Wed, Oct 07, 2015 at 02:02:11PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 10/7/2015 6:39 AM, Simon Horman wrote:
> 
> >>Define the Porter board dependent part of the SDHI0/2 device nodes along with
> >>the  necessary  voltage regulators (note that the Vcc regulators are dummy --
> >>they are required but don't actually exist on the board). Also, GPIOs have to
> >>be used for the CD and WP signals due to the SDHI driver constraints...
> >>
> >>This patch is analogous to the commit 1299df03d719 (ARM: shmobile: henninger:
> >>add SDHI0/2 DT support) as there  are no differences between those boards in
> >>this respect.
> >>
> >>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >>
> >>---
> >>This patch is against the 'renesas-devel-20151006-v4.3-rc4' tag of Simon
> >>Horman's 'renesas.git' repo.
> >
> >Thanks I have queued this up after addressing some issues
> >in the changelog that checkpatch complained about:
> >
> >* text > 75 characters wide
> >* Missing '"' around name of patch referred to
> >
> >Its looking like there is already quite a log shared between
> 
>    Lot?
> 
> >r8a7791-porter.dts and r8a7791-henninger.dts. Do you have any
> >thoughts on consolidating or sharing common elements between
> >them somehow?
> 
>    I'm still planning to remove the Henninger's .dts for good. It was never
> sold and so had no users outside Renesas (and Cogent Embedded), I was told.

Thanks, that sounds like a good plan to me.
Do you have any thoughts on when?

Re: [PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[Sergei Shtylyov]

Hello.

On 10/8/2015 5:12 AM, Simon Horman wrote:

>>>> Define the Porter board dependent part of the SDHI0/2 device nodes along with
>>>> the  necessary  voltage regulators (note that the Vcc regulators are dummy --
>>>> they are required but don't actually exist on the board). Also, GPIOs have to
>>>> be used for the CD and WP signals due to the SDHI driver constraints...
>>>>
>>>> This patch is analogous to the commit 1299df03d719 (ARM: shmobile: henninger:
>>>> add SDHI0/2 DT support) as there  are no differences between those boards in
>>>> this respect.
>>>>
>>>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>>>
>>>> ---
>>>> This patch is against the 'renesas-devel-20151006-v4.3-rc4' tag of Simon
>>>> Horman's 'renesas.git' repo.
>>>
>>> Thanks I have queued this up after addressing some issues
>>> in the changelog that checkpatch complained about:
>>>
>>> * text > 75 characters wide
>>> * Missing '"' around name of patch referred to
>>>
>>> Its looking like there is already quite a log shared between
>>
>>     Lot?
>>
>>> r8a7791-porter.dts and r8a7791-henninger.dts. Do you have any
>>> thoughts on consolidating or sharing common elements between
>>> them somehow?
>>
>>     I'm still planning to remove the Henninger's .dts for good. It was never
>> sold and so had no users outside Renesas (and Cogent Embedded), I was told.
>
> Thanks, that sounds like a good plan to me.
> Do you have any thoughts on when?

    Well, I was going to reach the feature parity between these 2 boards, i.e. 
to support all devices on Porter that are supported on Henninger...

MBR, Sergei

Re: [PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[Simon Horman]

On Thu, Oct 08, 2015 at 01:54:00PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 10/8/2015 5:12 AM, Simon Horman wrote:
> 
> >>>>Define the Porter board dependent part of the SDHI0/2 device nodes along with
> >>>>the  necessary  voltage regulators (note that the Vcc regulators are dummy --
> >>>>they are required but don't actually exist on the board). Also, GPIOs have to
> >>>>be used for the CD and WP signals due to the SDHI driver constraints...
> >>>>
> >>>>This patch is analogous to the commit 1299df03d719 (ARM: shmobile: henninger:
> >>>>add SDHI0/2 DT support) as there  are no differences between those boards in
> >>>>this respect.
> >>>>
> >>>>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >>>>
> >>>>---
> >>>>This patch is against the 'renesas-devel-20151006-v4.3-rc4' tag of Simon
> >>>>Horman's 'renesas.git' repo.
> >>>
> >>>Thanks I have queued this up after addressing some issues
> >>>in the changelog that checkpatch complained about:
> >>>
> >>>* text > 75 characters wide
> >>>* Missing '"' around name of patch referred to
> >>>
> >>>Its looking like there is already quite a log shared between
> >>
> >>    Lot?
> >>
> >>>r8a7791-porter.dts and r8a7791-henninger.dts. Do you have any
> >>>thoughts on consolidating or sharing common elements between
> >>>them somehow?
> >>
> >>    I'm still planning to remove the Henninger's .dts for good. It was never
> >>sold and so had no users outside Renesas (and Cogent Embedded), I was told.
> >
> >Thanks, that sounds like a good plan to me.
> >Do you have any thoughts on when?
> 
>    Well, I was going to reach the feature parity between these 2 boards,
> i.e. to support all devices on Porter that are supported on Henninger...

THanks, that sounds like an entirely reasonable plan to me.

Re: [PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[Sergei Shtylyov]

On 10/07/2015 06:39 AM, Simon Horman wrote:

>> Define the Porter board dependent part of the SDHI0/2 device nodes along with
>> the  necessary  voltage regulators (note that the Vcc regulators are dummy --
>> they are required but don't actually exist on the board). Also, GPIOs have to
>> be used for the CD and WP signals due to the SDHI driver constraints...
>>
>> This patch is analogous to the commit 1299df03d719 (ARM: shmobile: henninger:
>> add SDHI0/2 DT support) as there  are no differences between those boards in
>> this respect.
>>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>
>> ---
>> This patch is against the 'renesas-devel-20151006-v4.3-rc4' tag of Simon
>> Horman's 'renesas.git' repo.
>
> Thanks I have queued this up after addressing some issues
> in the changelog that checkpatch complained about:

> * text > 75 characters wide
> * Missing '"' around name of patch referred to

    Sorry about that, forgot to run thru checkpatch.pl (as usual :-).

MBR, Sergei

Re: [PATCH] ARM: shmobile: porter: add SDHI0/2 DT support

[Simon Horman]

On Wed, Oct 07, 2015 at 10:34:48PM +0300, Sergei Shtylyov wrote:
> On 10/07/2015 06:39 AM, Simon Horman wrote:
> 
> >>Define the Porter board dependent part of the SDHI0/2 device nodes along with
> >>the  necessary  voltage regulators (note that the Vcc regulators are dummy --
> >>they are required but don't actually exist on the board). Also, GPIOs have to
> >>be used for the CD and WP signals due to the SDHI driver constraints...
> >>
> >>This patch is analogous to the commit 1299df03d719 (ARM: shmobile: henninger:
> >>add SDHI0/2 DT support) as there  are no differences between those boards in
> >>this respect.
> >>
> >>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >>
> >>---
> >>This patch is against the 'renesas-devel-20151006-v4.3-rc4' tag of Simon
> >>Horman's 'renesas.git' repo.
> >
> >Thanks I have queued this up after addressing some issues
> >in the changelog that checkpatch complained about:
> 
> >* text > 75 characters wide
> >* Missing '"' around name of patch referred to
> 
>    Sorry about that, forgot to run thru checkpatch.pl (as usual :-).

No harm done.