[PATCH 0/2] Add R8A77980/Condor eMMC support

[PATCH 0/2] Add R8A77980/Condor eMMC support

[Sergei Shtylyov]

Hello!

Here's the set of 2 patches against Simon Horman's 'renesas.git' repo's
'renesas-devel-20180412-v4.16' tag. We're adding the R8A77980 MMC (SDHI)
device nodes and then enable eMMC support on the Condor board. These patches
are atop of the recently posted PCIe/PFC R8A77980/Condor patches and they
depend on the R8A77980 SDHI driver support patch (not posted yet) in order
to work properly...

[1/2] arm64: dts: renesas: r8a77980: add MMC support
[2/2] arm64: dts: renesas: condor: add eMMC support

WBR, Sergei

[PATCH 1/2] arm64: dts: renesas: r8a77980: add MMC support

[Sergei Shtylyov]

Define the generic R8A77980 part of the MMC0 (SDHI2) device node.

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

---
 arch/arm64/boot/dts/renesas/r8a77980.dtsi |   12 ++++++++++++
 1 file changed, 12 insertions(+)

Index: renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
===================================================================
--- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980.dtsi
+++ renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
@@ -371,6 +371,18 @@
 			dma-channels = <16>;
 		};
 
+		mmc0: mmc@ee140000 {
+			compatible = "renesas,sdhi-r8a77980",
+				     "renesas,rcar-gen3-sdhi";
+			reg = <0 0xee140000 0 0x2000>;
+			interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 314>;
+			power-domains = <&sysc 32>;
+			resets = <&cpg 314>;
+			max-frequency = <200000000>;
+			status = "disabled";
+		};
+
 		gic: interrupt-controller@f1010000 {
 			compatible = "arm,gic-400";
 			#interrupt-cells = <3>;

[PATCH 2/2] arm64: dts: renesas: condor: add eMMC support

[Sergei Shtylyov]

Define the Condor board dependent part of the MMC0 (connected to eMMC chip)
device node along with the necessary voltage regulators...

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

---
 arch/arm64/boot/dts/renesas/r8a77980-condor.dts |   43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
===================================================================
--- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
+++ renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
@@ -27,6 +27,24 @@
 		/* first 128MB is reserved for secure area. */
 		reg = <0 0x48000000 0 0x78000000>;
 	};
+
+	d3_3v: regulator-0 {
+		compatible = "regulator-fixed";
+		regulator-name = "D3.3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	vddq_vin01: regulator-1 {
+		compatible = "regulator-fixed";
+		regulator-name = "VDDQ_VIN01";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
 };
 
 &avb {
@@ -52,6 +70,19 @@
 	clock-frequency = <32768>;
 };
 
+&mmc0 {
+	pinctrl-0 = <&mmc_3_3v_pins>;
+	pinctrl-1 = <&mmc_1_8v_pins>;
+	pinctrl-names = "default", "state_uhs";
+
+	vmmc-supply = <&d3_3v>;
+	vqmmc-supply = <&vddq_vin01>;
+	mmc-hs200-1_8v;
+	bus-width = <8>;
+	non-removable;
+	status = "okay";
+};
+
 &pciec {
 	status = "okay";
 };
@@ -70,6 +101,18 @@
 		function = "avb";
 	};
 
+	mmc_1_8v_pins: mmc_1_8v {
+		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
+		function = "mmc";
+		power-source = <1800>;
+	};
+
+	mmc_3_3v_pins: mmc_3_3v {
+		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
+		function = "mmc";
+		power-source = <3300>;
+	};
+
 	scif0_pins: scif0 {
 		groups = "scif0_data";
 		function = "scif0";

Re: [PATCH 1/2] arm64: dts: renesas: r8a77980: add MMC support

[Simon Horman]

On Sat, Apr 14, 2018 at 10:27:04PM +0300, Sergei Shtylyov wrote:
> Define the generic R8A77980 part of the MMC0 (SDHI2) device node.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
>  arch/arm64/boot/dts/renesas/r8a77980.dtsi |   12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> ===================================================================
> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> @@ -371,6 +371,18 @@
>  			dma-channels = <16>;
>  		};
>  
> +		mmc0: mmc@ee140000 {

Please use sdhi2: sd@ee140000 for consistency with other SoCs
(I refereed to the r8a7795).

> +			compatible = "renesas,sdhi-r8a77980",
> +				     "renesas,rcar-gen3-sdhi";
> +			reg = <0 0xee140000 0 0x2000>;
> +			interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 314>;
> +			power-domains = <&sysc 32>;
> +			resets = <&cpg 314>;
> +			max-frequency = <200000000>;
> +			status = "disabled";
> +		};
> +
>  		gic: interrupt-controller@f1010000 {
>  			compatible = "arm,gic-400";
>  			#interrupt-cells = <3>;
> 

Re: [PATCH 2/2] arm64: dts: renesas: condor: add eMMC support

[Simon Horman]

On Sat, Apr 14, 2018 at 10:28:29PM +0300, Sergei Shtylyov wrote:
> Define the Condor board dependent part of the MMC0 (connected to eMMC chip)
> device node along with the necessary voltage regulators...
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
>  arch/arm64/boot/dts/renesas/r8a77980-condor.dts |   43 ++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
> 
> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> ===================================================================
> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> @@ -27,6 +27,24 @@
>  		/* first 128MB is reserved for secure area. */
>  		reg = <0 0x48000000 0 0x78000000>;
>  	};
> +
> +	d3_3v: regulator-0 {

Please use reg_3p3v: regulator1 for consistency with salvator-common.dtsi

> +		compatible = "regulator-fixed";
> +		regulator-name = "D3.3V";

And "fixed-3.3V"

> +		regulator-min-microvolt = <3300000>;
> +		regulator-max-microvolt = <3300000>;
> +		regulator-boot-on;
> +		regulator-always-on;
> +	};
> +
> +	vddq_vin01: regulator-1 {

And reg_1p8v: regulator0 {
> +		compatible = "regulator-fixed";
> +		regulator-name = "VDDQ_VIN01";

And "fixed-1.8V"

> +		regulator-min-microvolt = <1800000>;
> +		regulator-max-microvolt = <1800000>;
> +		regulator-boot-on;
> +		regulator-always-on;
> +	};
>  };
>  
>  &avb {
> @@ -52,6 +70,19 @@
>  	clock-frequency = <32768>;
>  };
>  
> +&mmc0 {
> +	pinctrl-0 = <&mmc_3_3v_pins>;
> +	pinctrl-1 = <&mmc_1_8v_pins>;
> +	pinctrl-names = "default", "state_uhs";
> +
> +	vmmc-supply = <&d3_3v>;
> +	vqmmc-supply = <&vddq_vin01>;
> +	mmc-hs200-1_8v;
> +	bus-width = <8>;
> +	non-removable;
> +	status = "okay";
> +};
> +
>  &pciec {
>  	status = "okay";
>  };
> @@ -70,6 +101,18 @@
>  		function = "avb";
>  	};
>  
> +	mmc_1_8v_pins: mmc_1_8v {
> +		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
> +		function = "mmc";
> +		power-source = <1800>;
> +	};
> +
> +	mmc_3_3v_pins: mmc_3_3v {
> +		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
> +		function = "mmc";
> +		power-source = <3300>;
> +	};

Again please make this more consistent with salvator-common.dtsi.

> +
>  	scif0_pins: scif0 {
>  		groups = "scif0_data";
>  		function = "scif0";
> 

Re: [PATCH 2/2] arm64: dts: renesas: condor: add eMMC support

[Sergei Shtylyov]

On 04/20/2018 01:03 PM, Simon Horman wrote:

>> Define the Condor board dependent part of the MMC0 (connected to eMMC chip)
>> device node along with the necessary voltage regulators...
>>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>
>> ---
>>  arch/arm64/boot/dts/renesas/r8a77980-condor.dts |   43 ++++++++++++++++++++++++
>>  1 file changed, 43 insertions(+)
>>
>> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
>> ===================================================================
>> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
>> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
>> @@ -27,6 +27,24 @@
>>  		/* first 128MB is reserved for secure area. */
>>  		reg = <0 0x48000000 0 0x78000000>;
>>  	};
>> +
>> +	d3_3v: regulator-0 {
> 
> Please use reg_3p3v: regulator1 for consistency with salvator-common.dtsi

   Hm, not sure why I have to copy what I consider a bad example... the SoCs are
not pin compatible anyway. 

>> +		compatible = "regulator-fixed";
>> +		regulator-name = "D3.3V";
> 
> And "fixed-3.3V"

   Ugh. That's pretty poor name I think. My names do correspond to the schematics
and these only muddle things up, I think...

[...]
>> @@ -70,6 +101,18 @@
>>  		function = "avb";
>>  	};
>>  
>> +	mmc_1_8v_pins: mmc_1_8v {
>> +		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
>> +		function = "mmc";
>> +		power-source = <1800>;
>> +	};
>> +
>> +	mmc_3_3v_pins: mmc_3_3v {
>> +		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
>> +		function = "mmc";
>> +		power-source = <3300>;
>> +	};
> 
> Again please make this more consistent with salvator-common.dtsi.

   Ah, you mean the _uhs label name postfix? OK...

[...]

MBR, Sergei

Re: [PATCH 1/2] arm64: dts: renesas: r8a77980: add MMC support

[Sergei Shtylyov]

On 04/20/2018 12:58 PM, Simon Horman wrote:

>> Define the generic R8A77980 part of the MMC0 (SDHI2) device node.
>>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>
>> ---
>>  arch/arm64/boot/dts/renesas/r8a77980.dtsi |   12 ++++++++++++
>>  1 file changed, 12 insertions(+)
>>
>> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
>> ===================================================================
>> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980.dtsi
>> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
>> @@ -371,6 +371,18 @@
>>  			dma-channels = <16>;
>>  		};
>>  
>> +		mmc0: mmc@ee140000 {
> 
> Please use sdhi2: sd@ee140000 for consistency with other SoCs
> (I refereed to the r8a7795).

   Mmm... note that this controller has MMC signals (8 data bits, DS, no CD/WP),
see manual v0.55. I think it's more correct to call it MMC0 (trken from the
manual as well)...

MBR, Sergei

Re: [PATCH 1/2] arm64: dts: renesas: r8a77980: add MMC support

[Simon Horman]

On Fri, Apr 20, 2018 at 10:06:03PM +0300, Sergei Shtylyov wrote:
> On 04/20/2018 12:58 PM, Simon Horman wrote:
> 
> >> Define the generic R8A77980 part of the MMC0 (SDHI2) device node.
> >>
> >> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >>
> >> ---
> >>  arch/arm64/boot/dts/renesas/r8a77980.dtsi |   12 ++++++++++++
> >>  1 file changed, 12 insertions(+)
> >>
> >> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> >> ===================================================================
> >> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> >> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980.dtsi
> >> @@ -371,6 +371,18 @@
> >>  			dma-channels = <16>;
> >>  		};
> >>  
> >> +		mmc0: mmc@ee140000 {
> > 
> > Please use sdhi2: sd@ee140000 for consistency with other SoCs
> > (I refereed to the r8a7795).
> 
>    Mmm... note that this controller has MMC signals (8 data bits, DS, no CD/WP),
> see manual v0.55. I think it's more correct to call it MMC0 (trken from the
> manual as well)...

Ok, point taken. I've applied this. But in general I would like the
dtsi files to be consistent where it makes sense.

Re: [PATCH 2/2] arm64: dts: renesas: condor: add eMMC support

[Simon Horman]

On Fri, Apr 20, 2018 at 09:51:06PM +0300, Sergei Shtylyov wrote:
> On 04/20/2018 01:03 PM, Simon Horman wrote:
> 
> >> Define the Condor board dependent part of the MMC0 (connected to eMMC chip)
> >> device node along with the necessary voltage regulators...
> >>
> >> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >>
> >> ---
> >>  arch/arm64/boot/dts/renesas/r8a77980-condor.dts |   43 ++++++++++++++++++++++++
> >>  1 file changed, 43 insertions(+)
> >>
> >> Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> >> ===================================================================
> >> --- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> >> +++ renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
> >> @@ -27,6 +27,24 @@
> >>  		/* first 128MB is reserved for secure area. */
> >>  		reg = <0 0x48000000 0 0x78000000>;
> >>  	};
> >> +
> >> +	d3_3v: regulator-0 {
> > 
> > Please use reg_3p3v: regulator1 for consistency with salvator-common.dtsi
> 
>    Hm, not sure why I have to copy what I consider a bad example... the SoCs are
> not pin compatible anyway. 
> 
> >> +		compatible = "regulator-fixed";
> >> +		regulator-name = "D3.3V";
> > 
> > And "fixed-3.3V"
> 
>    Ugh. That's pretty poor name I think. My names do correspond to the schematics
> and these only muddle things up, I think...
> 
> [...]
> >> @@ -70,6 +101,18 @@
> >>  		function = "avb";
> >>  	};
> >>  
> >> +	mmc_1_8v_pins: mmc_1_8v {
> >> +		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
> >> +		function = "mmc";
> >> +		power-source = <1800>;
> >> +	};
> >> +
> >> +	mmc_3_3v_pins: mmc_3_3v {
> >> +		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
> >> +		function = "mmc";
> >> +		power-source = <3300>;
> >> +	};
> > 
> > Again please make this more consistent with salvator-common.dtsi.
> 
>    Ah, you mean the _uhs label name postfix? OK...

Thanks, could you send a v2?

[PATCH v2] arm64: dts: renesas: condor: add eMMC support

[Sergei Shtylyov]

Define the Condor board dependent part of the MMC0 (connected to eMMC chip)
device node along with the necessary voltage regulators...

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

---
This patch is against the 'renesas-devel-20180424-v4.17-rc2' tag of Simon
Horman's 'renesas.git' repo.

Changes in version 2:
- renamed the pin groups and their labels, alos changing their order;
- reordered this patch before the PCIe patch.

 arch/arm64/boot/dts/renesas/r8a77980-condor.dts |   43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

Index: renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
===================================================================
--- renesas.orig/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
+++ renesas/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
@@ -27,6 +27,24 @@
 		/* first 128MB is reserved for secure area. */
 		reg = <0 0x48000000 0 0x78000000>;
 	};
+
+	d3_3v: regulator-0 {
+		compatible = "regulator-fixed";
+		regulator-name = "D3.3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	vddq_vin01: regulator-1 {
+		compatible = "regulator-fixed";
+		regulator-name = "VDDQ_VIN01";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
 };
 
 &avb {
@@ -52,12 +70,37 @@
 	clock-frequency = <32768>;
 };
 
+&mmc0 {
+	pinctrl-0 = <&mmc_pins>;
+	pinctrl-1 = <&mmc_pins_uhs>;
+	pinctrl-names = "default", "state_uhs";
+
+	vmmc-supply = <&d3_3v>;
+	vqmmc-supply = <&vddq_vin01>;
+	mmc-hs200-1_8v;
+	bus-width = <8>;
+	non-removable;
+	status = "okay";
+};
+
 &pfc {
 	avb_pins: avb {
 		groups = "avb_mdio", "avb_rgmii";
 		function = "avb";
 	};
 
+	mmc_pins: mmc {
+		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
+		function = "mmc";
+		power-source = <3300>;
+	};
+
+	mmc_pins_uhs: mmc_uhs {
+		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
+		function = "mmc";
+		power-source = <1800>;
+	};
+
 	scif0_pins: scif0 {
 		groups = "scif0_data";
 		function = "scif0";

Re: [PATCH v2] arm64: dts: renesas: condor: add eMMC support

[Simon Horman]

On Tue, Apr 24, 2018 at 10:25:24PM +0300, Sergei Shtylyov wrote:
> Define the Condor board dependent part of the MMC0 (connected to eMMC chip)
> device node along with the necessary voltage regulators...
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
> This patch is against the 'renesas-devel-20180424-v4.17-rc2' tag of Simon
> Horman's 'renesas.git' repo.

Thanks, applied.