[PATCH v2 0/2] ARM: dts: r7s72100: add sdhi DT

[PATCH v2 0/2] ARM: dts: r7s72100: add sdhi DT

[Chris Brandt]

SUMMARY:
This series adds sdhi to the r7s72100 (RZ/A1) Device Tree.

DEPENDECIES:
This series is dependent on the tmio/sh_sdhi patches being
applied to add r7s72100 support.
  mmc: sh_mobile_sdhi: add ocr_mask option
  mmc: tmio-mmc: add support for 32bit data port
  mmc: sh_mobile_sdhi: Add r7s72100 support

MERGE CONFLICTS:
There are also patches being reviewed for adding mmc so depending on how
they get applied, there might be a line conflict.
To resolve the merge conflict, simply put the MMC nodes before
the SDHI nodes (just because that seems to be the order in other
Renesas SoCs DTs)

CHANGES:
V1->V2
* Removed patch "[PATCH 1/3] ARM: dts: r7s72100: add sdhi clock to device tree"
  because it has already been queued up
* moved bus-with property from dtsi to dts


Chris Brandt (2):
  ARM: dts: r7s72100: add sdhi to device tree
  ARM: dts: rskrza1: add sdhi1 DT support

 arch/arm/boot/dts/r7s72100-rskrza1.dts |  5 +++++
 arch/arm/boot/dts/r7s72100.dtsi        | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

-- 
2.9.2

[PATCH v2 1/2] ARM: dts: r7s72100: add sdhi to device tree

[Chris Brandt]

Signed-off-by: Chris Brandt <chris.brandt-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
---
v2:
 * removed bus-width
---
 arch/arm/boot/dts/r7s72100.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index e97d6d1..53a38e3 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -458,4 +458,30 @@
 		#size-cells = <0>;
 		status = "disabled";
 	};
+
+	sdhi0: sd@e804e000 {
+		compatible = "renesas,sdhi-r7s72100";
+		reg = <0xe804e000 0x100>;
+		interrupts = <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+
+		clocks = <&mstp12_clks R7S72100_CLK_SDHI0>;
+		cap-sd-highspeed;
+		cap-sdio-irq;
+		status = "disabled";
+	};
+
+	sdhi1: sd@e804e800 {
+		compatible = "renesas,sdhi-r7s72100";
+		reg = <0xe804e800 0x100>;
+		interrupts = <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>;
+
+		clocks = <&mstp12_clks R7S72100_CLK_SDHI1>;
+		cap-sd-highspeed;
+		cap-sdio-irq;
+		status = "disabled";
+	};
 };
-- 
2.9.2


--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 1/2] ARM: dts: r7s72100: add sdhi to device tree

[Chris Brandt]

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
---
v2:
 * removed bus-width
---
 arch/arm/boot/dts/r7s72100.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index e97d6d1..53a38e3 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -458,4 +458,30 @@
 		#size-cells = <0>;
 		status = "disabled";
 	};
+
+	sdhi0: sd@e804e000 {
+		compatible = "renesas,sdhi-r7s72100";
+		reg = <0xe804e000 0x100>;
+		interrupts = <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+
+		clocks = <&mstp12_clks R7S72100_CLK_SDHI0>;
+		cap-sd-highspeed;
+		cap-sdio-irq;
+		status = "disabled";
+	};
+
+	sdhi1: sd@e804e800 {
+		compatible = "renesas,sdhi-r7s72100";
+		reg = <0xe804e800 0x100>;
+		interrupts = <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH
+			      GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>;
+
+		clocks = <&mstp12_clks R7S72100_CLK_SDHI1>;
+		cap-sd-highspeed;
+		cap-sdio-irq;
+		status = "disabled";
+	};
 };
-- 
2.9.2

[PATCH v2 2/2] ARM: dts: rskrza1: add sdhi1 DT support

[Chris Brandt]

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
---
v2:
* added bus-width
---
 arch/arm/boot/dts/r7s72100-rskrza1.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/r7s72100-rskrza1.dts b/arch/arm/boot/dts/r7s72100-rskrza1.dts
index e5dea5b..dd44181 100644
--- a/arch/arm/boot/dts/r7s72100-rskrza1.dts
+++ b/arch/arm/boot/dts/r7s72100-rskrza1.dts
@@ -56,6 +56,11 @@
 	};
 };
 
+&sdhi1 {
+	bus-width = <4>;
+	status = "okay";
+};
+
 &scif2 {
 	status = "okay";
 };
-- 
2.9.2

Re: [PATCH v2 2/2] ARM: dts: rskrza1: add sdhi1 DT support

[Geert Uytterhoeven]

On Mon, Sep 26, 2016 at 10:40 PM, Chris Brandt <chris.brandt-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org> wrote:
> Signed-off-by: Chris Brandt <chris.brandt-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>

Reviewed-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 2/2] ARM: dts: rskrza1: add sdhi1 DT support

[Geert Uytterhoeven]

On Mon, Sep 26, 2016 at 10:40 PM, Chris Brandt <chris.brandt@renesas.com> wrote:
> Signed-off-by: Chris Brandt <chris.brandt@renesas.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2 0/2] ARM: dts: r7s72100: add sdhi DT

[Simon Horman]

On Mon, Sep 26, 2016 at 04:40:30PM -0400, Chris Brandt wrote:
> SUMMARY:
> This series adds sdhi to the r7s72100 (RZ/A1) Device Tree.
> 
> DEPENDECIES:
> This series is dependent on the tmio/sh_sdhi patches being
> applied to add r7s72100 support.
>   mmc: sh_mobile_sdhi: add ocr_mask option
>   mmc: tmio-mmc: add support for 32bit data port
>   mmc: sh_mobile_sdhi: Add r7s72100 support
> 
> MERGE CONFLICTS:
> There are also patches being reviewed for adding mmc so depending on how
> they get applied, there might be a line conflict.
> To resolve the merge conflict, simply put the MMC nodes before
> the SDHI nodes (just because that seems to be the order in other
> Renesas SoCs DTs)

Thanks for the notes above.

I have decided to queue this up (for v4.10). Please let me know
if that was not desired. Or if subsequently it becomes undesirable
(i.e. if I should drop these patches).

> CHANGES:
> V1->V2
> * Removed patch "[PATCH 1/3] ARM: dts: r7s72100: add sdhi clock to device tree"
>   because it has already been queued up
> * moved bus-with property from dtsi to dts
> 
> 
> Chris Brandt (2):
>   ARM: dts: r7s72100: add sdhi to device tree
>   ARM: dts: rskrza1: add sdhi1 DT support
> 
>  arch/arm/boot/dts/r7s72100-rskrza1.dts |  5 +++++
>  arch/arm/boot/dts/r7s72100.dtsi        | 26 ++++++++++++++++++++++++++
>  2 files changed, 31 insertions(+)
> 
> -- 
> 2.9.2
> 
>