[PATCH 0/2] Add R8A7794/SILK QSPI DT support

[PATCH 0/2] Add R8A7794/SILK QSPI DT support

[Sergei Shtylyov]

Hello.

   Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-20150807-v4.2-rc5' tag plus the R8A7794 GPIO patches I've just
posted. Here we add the QSPI device tree support for the R8A7794/SILK board.

[1/2] ARM: shmobile: r8a7794: add QSPI DT support
[2/2] ARM: shmobile: silk: add QSPI DT support

WBR, Sergei

[PATCH 1/2] ARM: shmobile: r8a7794: add QSPI DT support

[Sergei Shtylyov]

Define the generic R8A7794 part of the QSPI device node.

Based on original patch by Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>.

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

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

Index: renesas/arch/arm/boot/dts/r8a7794.dtsi
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
+++ renesas/arch/arm/boot/dts/r8a7794.dtsi
@@ -19,6 +19,10 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
+	aliases {
+		spi0 = &qspi;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -537,6 +541,20 @@
 		status = "disabled";
 	};
 
+	qspi: spi@e6b10000 {
+		compatible = "renesas,qspi-r8a7794", "renesas,qspi";
+		reg = <0 0xe6b10000 0 0x2c>;
+		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp9_clks R8A7794_CLK_QSPI_MOD>;
+		power-domains = <&cpg_clocks>;
+		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
+		dma-names = "tx", "rx";
+		num-cs = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	clocks {
 		#address-cells = <2>;
 		#size-cells = <2>;

Re: [PATCH 1/2] ARM: shmobile: r8a7794: add QSPI DT support

[Geert Uytterhoeven]

On Sun, Aug 9, 2015 at 12:26 AM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Define the generic R8A7794 part of the QSPI device node.
>
> Based on original patch by Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

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

 arch/arm/boot/dts/r8a7794.dtsi |   18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>
> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi
> ===================================================================
> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi
> @@ -19,6 +19,10 @@
>         #address-cells = <2>;
>         #size-cells = <2>;
>
> +       aliases {
> +               spi0 = &qspi;
> +       };
> +
>         cpus {
>                 #address-cells = <1>;
>                 #size-cells = <0>;
> @@ -537,6 +541,20 @@
>                 status = "disabled";
>         };
>
> +       qspi: spi@e6b10000 {
> +               compatible = "renesas,qspi-r8a7794", "renesas,qspi";
> +               reg = <0 0xe6b10000 0 0x2c>;
> +               interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
> +               clocks = <&mstp9_clks R8A7794_CLK_QSPI_MOD>;
> +               power-domains = <&cpg_clocks>;

For consistency with the other nodes, I'd add "power-domains" below the
DMA-related properties.

> +               dmas = <&dmac0 0x17>, <&dmac0 0x18>;
> +               dma-names = "tx", "rx";
> +               num-cs = <1>;
> +               #address-cells = <1>;
> +               #size-cells = <0>;
> +               status = "disabled";
> +       };
> +
>         clocks {
>                 #address-cells = <2>;
>                 #size-cells = <2>;

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

[PATCH 2/2] ARM: shmobile: silk: add QSPI DT support

[Sergei Shtylyov]

Define the SILK board dependent part of the QSPI device node.
Add device nodes  for Spansion  S25FL512S SPI flash and MTD partitions on it.

Based on the original patch by Vladimir Barinov
<vladimir.barinov@cogentembedded.com>.

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

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

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
@@ -65,6 +65,11 @@
 		renesas,groups = "mmc_data8", "mmc_ctrl";
 		renesas,function = "mmc";
 	};
+
+	qspi_pins: spi0 {
+		renesas,groups = "qspi_ctrl", "qspi_data4";
+		renesas,function = "qspi";
+	};
 };
 
 &scif2 {
@@ -100,3 +105,38 @@
 	non-removable;
 	status = "okay";
 };
+
+&qspi {
+	pinctrl-0 = <&qspi_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+
+	flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "spansion,s25fl512s";
+		reg = <0>;
+		spi-max-frequency = <30000000>;
+		spi-tx-bus-width = <4>;
+		spi-rx-bus-width = <4>;
+		m25p,fast-read;
+		spi-cpol;
+		spi-cpha;
+
+		partition@0 {
+			label = "loader";
+			reg = <0x00000000 0x00040000>;
+			read-only;
+		};
+		partition@40000 {
+			label = "user";
+			reg = <0x00040000 0x00400000>;
+			read-only;
+		};
+		partition@440000 {
+			label = "flash";
+			reg = <0x00440000 0x03bc0000>;
+		};
+	};
+};

Re: [PATCH 2/2] ARM: shmobile: silk: add QSPI DT support

[Geert Uytterhoeven]

Hi Sergei,

On Sun, Aug 9, 2015 at 12:27 AM, Sergei Shtylyov
<sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> wrote:
> Define the SILK board dependent part of the QSPI device node.
> Add device nodes  for Spansion  S25FL512S SPI flash and MTD partitions on it.
>
> Based on the original patch by Vladimir Barinov
> <vladimir.barinov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>

> --- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts
> +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts

> +&qspi {
> +       pinctrl-0 = <&qspi_pins>;
> +       pinctrl-names = "default";
> +
> +       status = "okay";
> +
> +       flash@0 {
> +               #address-cells = <1>;
> +               #size-cells = <1>;
> +               compatible = "spansion,s25fl512s";

Please add the "jedec,spi-nor" fallback.

> +               reg = <0>;
> +               spi-max-frequency = <30000000>;
> +               spi-tx-bus-width = <4>;
> +               spi-rx-bus-width = <4>;
> +               m25p,fast-read;

Please keep all "spi-*" properties together.

> +               spi-cpol;
> +               spi-cpha;

> +               partition@0 {
> +                       label = "loader";
> +                       reg = <0x00000000 0x00040000>;
> +                       read-only;
> +               };
> +               partition@40000 {
> +                       label = "user";
> +                       reg = <0x00040000 0x00400000>;
> +                       read-only;
> +               };
> +               partition@440000 {
> +                       label = "flash";
> +                       reg = <0x00440000 0x03bc0000>;
> +               };

The above part I cannot verify, so I have to trust you.

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 2/2] ARM: shmobile: silk: add QSPI DT support

[Sergei Shtylyov]

Hello.

On 08/10/2015 05:38 PM, Geert Uytterhoeven wrote:

>> Define the SILK board dependent part of the QSPI device node.
>> Add device nodes  for Spansion  S25FL512S SPI flash and MTD partitions on it.

>> Based on the original patch by Vladimir Barinov
>> <vladimir.barinov@cogentembedded.com>.

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

>> --- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts
>> +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts
>
>> +&qspi {
>> +       pinctrl-0 = <&qspi_pins>;
>> +       pinctrl-names = "default";
>> +
>> +       status = "okay";
>> +
>> +       flash@0 {
>> +               #address-cells = <1>;
>> +               #size-cells = <1>;
>> +               compatible = "spansion,s25fl512s";

> Please add the "jedec,spi-nor" fallback.

    Hm, spi-nor.c alone can't control this device, it's rather m25p80.c that's 
the real driver. So if a fallback needs to be added indeed it should be 
"st,m25p80" I think...

[...]

> Gr{oetje,eeting}s,

MBR, Sergei

Re: [PATCH 2/2] ARM: shmobile: silk: add QSPI DT support

[Geert Uytterhoeven]

Hi Sergei,

On Mon, Aug 10, 2015 at 8:18 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> On 08/10/2015 05:38 PM, Geert Uytterhoeven wrote:
>>> +&qspi {
>>> +       pinctrl-0 = <&qspi_pins>;
>>> +       pinctrl-names = "default";
>>> +
>>> +       status = "okay";
>>> +
>>> +       flash@0 {
>>> +               #address-cells = <1>;
>>> +               #size-cells = <1>;
>>> +               compatible = "spansion,s25fl512s";
>
>> Please add the "jedec,spi-nor" fallback.
>
>    Hm, spi-nor.c alone can't control this device, it's rather m25p80.c
> that's the real driver. So if a fallback needs to be added indeed it should
> be "st,m25p80" I think...

Please have a look at Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt.

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