[PATCH v2 0/2] R-Car D3 (r8a77995) SDHI (eMMC) integration

[PATCH v2 0/2] R-Car D3 (r8a77995) SDHI (eMMC) integration

[Ulrich Hecht]

Hi!

This integrates the SDHI hardware on R-Car D3 and enables the Draak board's
eMMC drive.

This revision dumps the two patches that have been applied already, fixes
the sdhi2_pins voltage, removes the redundant SDHI compatible string and
makes the internal DMAC whitelisting pattern more conservative.

CU
Uli


Ulrich Hecht (2):
  mmc: renesas_sdhi: enable R-Car D3 (r8a77995) support
  arm64: dts: r8a77995: draak: enable SDHI2

 arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 44 ++++++++++++++++++++++++++
 drivers/mmc/host/renesas_sdhi_internal_dmac.c  |  1 +
 2 files changed, 45 insertions(+)

-- 
2.7.4

[PATCH v2 1/2] mmc: renesas_sdhi: enable R-Car D3 (r8a77995) support

[Ulrich Hecht]

Whitelists for internal DMAC implementation.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index 41cbe84..396ae8a 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -255,6 +255,7 @@ static const struct soc_device_attribute gen3_soc_whitelist[] = {
         { .soc_id = "r8a7795", .revision = "ES1.*" },
         { .soc_id = "r8a7795", .revision = "ES2.0" },
         { .soc_id = "r8a7796", .revision = "ES1.0" },
+        { .soc_id = "r8a77995", .revision = "ES1.0" },
         { /* sentinel */ }
 };
 
-- 
2.7.4

[PATCH v2 2/2] arm64: dts: r8a77995: draak: enable SDHI2

[Ulrich Hecht]

The single SDHI controller is connected to eMMC.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 44 ++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
index 91f247f..e690cf8 100644
--- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
@@ -32,6 +32,24 @@
 		/* first 128MB is reserved for secure area. */
 		reg = <0x0 0x48000000 0x0 0x18000000>;
 	};
+
+	reg_1p8v: regulator0 {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-1.8V";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	reg_3p3v: regulator1 {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-3.3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
 };
 
 &extal_clk {
@@ -71,6 +89,18 @@
 		function = "scif2";
 	};
 
+	sdhi2_pins: sd2 {
+		groups = "mmc_data8", "mmc_ctrl";
+		function = "mmc";
+		power-source = <1800>;
+	};
+
+	sdhi2_pins_uhs: sd2_uhs {
+		groups = "mmc_data8", "mmc_ctrl";
+		function = "mmc";
+		power-source = <1800>;
+	};
+
 	usb0_pins: usb0 {
 		groups = "usb0";
 		function = "usb0";
@@ -125,6 +155,20 @@
 	status = "okay";
 };
 
+&sdhi2 {
+	/* used for on-board eMMC */
+	pinctrl-0 = <&sdhi2_pins>;
+	pinctrl-1 = <&sdhi2_pins_uhs>;
+	pinctrl-names = "default", "state_uhs";
+
+	vmmc-supply = <&reg_3p3v>;
+	vqmmc-supply = <&reg_1p8v>;
+	bus-width = <8>;
+	mmc-hs200-1_8v;
+	non-removable;
+	status = "okay";
+};
+
 &usb2_phy0 {
 	pinctrl-0 = <&usb0_pins>;
 	pinctrl-names = "default";
-- 
2.7.4

Re: [PATCH v2 1/2] mmc: renesas_sdhi: enable R-Car D3 (r8a77995) support

[Ulf Hansson]

On 29 November 2017 at 17:06, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Whitelists for internal DMAC implementation.
>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, applied for next!

Kind regards
Uffe

> ---
>  drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> index 41cbe84..396ae8a 100644
> --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> @@ -255,6 +255,7 @@ static const struct soc_device_attribute gen3_soc_whitelist[] = {
>          { .soc_id = "r8a7795", .revision = "ES1.*" },
>          { .soc_id = "r8a7795", .revision = "ES2.0" },
>          { .soc_id = "r8a7796", .revision = "ES1.0" },
> +        { .soc_id = "r8a77995", .revision = "ES1.0" },
>          { /* sentinel */ }
>  };
>
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 0/2] R-Car D3 (r8a77995) SDHI (eMMC) integration

[Simon Horman]

On Wed, Nov 29, 2017 at 05:06:44PM +0100, Ulrich Hecht wrote:
> Hi!
> 
> This integrates the SDHI hardware on R-Car D3 and enables the Draak board's
> eMMC drive.
> 
> This revision dumps the two patches that have been applied already, fixes
> the sdhi2_pins voltage, removes the redundant SDHI compatible string and
> makes the internal DMAC whitelisting pattern more conservative.
> 
> CU
> Uli
> 
> 
> Ulrich Hecht (2):
>   mmc: renesas_sdhi: enable R-Car D3 (r8a77995) support
>   arm64: dts: r8a77995: draak: enable SDHI2

Hi Ulrich,

what is the effect of applying patch 2/2 without patch 1/2?
I see that 1/2 has been accepted but ideally I'd like to apply
2/2 to a branch without 1/2 present.

Re: [PATCH v2 0/2] R-Car D3 (r8a77995) SDHI (eMMC) integration

[Ulf Hansson]

On 1 December 2017 at 09:20, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Nov 29, 2017 at 05:06:44PM +0100, Ulrich Hecht wrote:
>> Hi!
>>
>> This integrates the SDHI hardware on R-Car D3 and enables the Draak board's
>> eMMC drive.
>>
>> This revision dumps the two patches that have been applied already, fixes
>> the sdhi2_pins voltage, removes the redundant SDHI compatible string and
>> makes the internal DMAC whitelisting pattern more conservative.
>>
>> CU
>> Uli
>>
>>
>> Ulrich Hecht (2):
>>   mmc: renesas_sdhi: enable R-Car D3 (r8a77995) support
>>   arm64: dts: r8a77995: draak: enable SDHI2
>
> Hi Ulrich,
>
> what is the effect of applying patch 2/2 without patch 1/2?
> I see that 1/2 has been accepted but ideally I'd like to apply
> 2/2 to a branch without 1/2 present.

If there is a problem with that, I can take it with your ack. Just tell me.

Kind regards
Uffe

Re: [PATCH v2 1/2] mmc: renesas_sdhi: enable R-Car D3 (r8a77995) support

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

On Wed, Nov 29, 2017 at 05:06:45PM +0100, Ulrich Hecht wrote:
> Whitelists for internal DMAC implementation.
> 
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v2 2/2] arm64: dts: r8a77995: draak: enable SDHI2

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

On Wed, Nov 29, 2017 at 05:06:46PM +0100, Ulrich Hecht wrote:
> The single SDHI controller is connected to eMMC.
> 
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v2 2/2] arm64: dts: r8a77995: draak: enable SDHI2

[Simon Horman]

On Mon, Dec 04, 2017 at 10:29:00PM +0100, Wolfram Sang wrote:
> On Wed, Nov 29, 2017 at 05:06:46PM +0100, Ulrich Hecht wrote:
> > The single SDHI controller is connected to eMMC.
> > 
> > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> 
> Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Thanks, applied now that patch 1/2 is in an rc release.