[cip-dev] [PATCH 0/4] Add MSIOF support to r8a7743

[cip-dev] [PATCH 0/4] Add MSIOF support to r8a7743

[Fabrizio Castro]

Dear All,

this series backports all that is required to add MSIOF support
to r8a7743.

Thanks,

Fabrizio Castro (3):
  spi: sh-msiof: Add compatible strings for r8a774[35]
  spi: sh-msiof: Add r8a774[35] to the compatible list
  ARM: dts: r8a7743: Add MSIOF[012] support

Simon Horman (1):
  spi: sh-msiof: Add R-Car Gen 2 and 3 fallback bindings

 Documentation/devicetree/bindings/spi/sh-msiof.txt | 18 +++++---
 arch/arm/boot/dts/r8a7743.dtsi                     | 48 ++++++++++++++++++++++
 drivers/spi/spi-sh-msiof.c                         |  5 ++-
 3 files changed, 65 insertions(+), 6 deletions(-)

-- 
2.7.4

[cip-dev] [PATCH 1/4] spi: sh-msiof: Add R-Car Gen 2 and 3 fallback bindings

[Fabrizio Castro]

From: Simon Horman <horms+renesas@verge.net.au>

In the case of Renesas R-Car hardware we know that there are generations of
SoCs, e.g. Gen 2 and Gen 3. But beyond that it's not clear what the
relationship between IP blocks might be. For example, I believe that
r8a7790 is older than r8a7791 but that doesn't imply that the latter is a
descendant of the former or vice versa.

We can, however, by examining the documentation and behaviour of the
hardware at run-time observe that the current driver implementation appears
to be compatible with the IP blocks on SoCs within a given generation.

For the above reasons and convenience when enabling new SoCs a
per-generation fallback compatibility string scheme is being adopted for
drivers for Renesas SoCs.

Also:
* Deprecate renesas,sh-msiof. It seems poorly named as it is only
  compatible with SH-Mobile. It also appears unused in mainline.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 4286db8456f4fa0c6af2b6b9abc5991a7e7da69c)
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
(cherry picked from commit 77f252646eb0ec1e78847fe5725c98ee9e70b39e)
(removed "renesas,rcar-gen3-msiof")
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
---
 Documentation/devicetree/bindings/spi/sh-msiof.txt | 18 ++++++++++++------
 drivers/spi/spi-sh-msiof.c                         |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt
index 705075d..ef65d54 100644
--- a/Documentation/devicetree/bindings/spi/sh-msiof.txt
+++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt
@@ -1,15 +1,20 @@
 Renesas MSIOF spi controller
 
 Required properties:
-- compatible           : "renesas,msiof-<soctype>" for SoCs,
-			 "renesas,sh-msiof" for SuperH, or
-			 "renesas,sh-mobile-msiof" for SH Mobile series.
-			 Examples with soctypes are:
-			 "renesas,msiof-r8a7790" (R-Car H2)
+- compatible           : "renesas,msiof-r8a7790" (R-Car H2)
 			 "renesas,msiof-r8a7791" (R-Car M2-W)
 			 "renesas,msiof-r8a7792" (R-Car V2H)
 			 "renesas,msiof-r8a7793" (R-Car M2-N)
 			 "renesas,msiof-r8a7794" (R-Car E2)
+			 "renesas,sh-mobile-msiof" (generic SH-Mobile compatibile device)
+			 "renesas,rcar-gen2-msiof" (generic R-Car Gen2 compatible device)
+			 "renesas,sh-msiof"      (deprecated)
+
+			 When compatible with the generic version, nodes
+			 must list the SoC-specific version corresponding
+			 to the platform first followed by the generic
+			 version.
+
 - reg                  : A list of offsets and lengths of the register sets for
 			 the device.
 			 If only one register set is present, it is to be used
@@ -59,7 +64,8 @@ Documentation/devicetree/bindings/pinctrl/renesas,*.
 Example:
 
 	msiof0: spi at e6e20000 {
-		compatible = "renesas,msiof-r8a7791";
+		compatible = "renesas,msiof-r8a7791",
+			     "renesas,rcar-gen2-msiof";
 		reg = <0 0xe6e20000 0 0x0064>;
 		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 3de39bd..e190b33 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -974,13 +974,14 @@ static const struct sh_msiof_chipdata r8a779x_data = {
 };
 
 static const struct of_device_id sh_msiof_match[] = {
-	{ .compatible = "renesas,sh-msiof",        .data = &sh_data },
 	{ .compatible = "renesas,sh-mobile-msiof", .data = &sh_data },
 	{ .compatible = "renesas,msiof-r8a7790",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7791",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7792",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7793",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7794",   .data = &r8a779x_data },
+	{ .compatible = "renesas,rcar-gen2-msiof", .data = &r8a779x_data },
+	{ .compatible = "renesas,sh-msiof",        .data = &sh_data }, // Deprecated
 	{},
 };
 MODULE_DEVICE_TABLE(of, sh_msiof_match);
-- 
2.7.4

[cip-dev] [PATCH 2/4] spi: sh-msiof: Add compatible strings for r8a774[35]

[Fabrizio Castro]

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit bdacfc7b6216dd30d07c10732fd4c0a660c62853)
(using r8a779x_data instead of rcar_gen2_data)
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
---
 drivers/spi/spi-sh-msiof.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index e190b33..dc5419d 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -975,6 +975,8 @@ static const struct sh_msiof_chipdata r8a779x_data = {
 
 static const struct of_device_id sh_msiof_match[] = {
 	{ .compatible = "renesas,sh-mobile-msiof", .data = &sh_data },
+	{ .compatible = "renesas,msiof-r8a7743",   .data = &r8a779x_data },
+	{ .compatible = "renesas,msiof-r8a7745",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7790",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7791",   .data = &r8a779x_data },
 	{ .compatible = "renesas,msiof-r8a7792",   .data = &r8a779x_data },
-- 
2.7.4

[cip-dev] [PATCH 3/4] spi: sh-msiof: Add r8a774[35] to the compatible list

[Fabrizio Castro]

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 4702f4b23a2fc6196abacf515a959e69176da40e)
(removed "renesas,rcar-gen3-msiof")
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
---
 Documentation/devicetree/bindings/spi/sh-msiof.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt
index ef65d54..7a20ec6 100644
--- a/Documentation/devicetree/bindings/spi/sh-msiof.txt
+++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt
@@ -1,13 +1,15 @@
 Renesas MSIOF spi controller
 
 Required properties:
-- compatible           : "renesas,msiof-r8a7790" (R-Car H2)
+- compatible           : "renesas,msiof-r8a7743" (RZ/G1M)
+			 "renesas,msiof-r8a7745" (RZ/G1E)
+			 "renesas,msiof-r8a7790" (R-Car H2)
 			 "renesas,msiof-r8a7791" (R-Car M2-W)
 			 "renesas,msiof-r8a7792" (R-Car V2H)
 			 "renesas,msiof-r8a7793" (R-Car M2-N)
 			 "renesas,msiof-r8a7794" (R-Car E2)
 			 "renesas,sh-mobile-msiof" (generic SH-Mobile compatibile device)
-			 "renesas,rcar-gen2-msiof" (generic R-Car Gen2 compatible device)
+			 "renesas,rcar-gen2-msiof" (generic R-Car Gen2 and RZ/G1 compatible device)
 			 "renesas,sh-msiof"      (deprecated)
 
 			 When compatible with the generic version, nodes
-- 
2.7.4

[cip-dev] [PATCH 4/4] ARM: dts: r8a7743: Add MSIOF[012] support

[Fabrizio Castro]

Add the DT nodes needed by MSIOF[012] interfaces to the SoC dtsi.
Also, define aliases for spi[123].

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7031a219f649d12acda8a70a4b6b816ee123c8e2)
(changed clocks and power-domains properties, removed resets property)
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
---
 arch/arm/boot/dts/r8a7743.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index 40137cf..0cdfb6b 100644
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -28,6 +28,9 @@
 		i2c6 = &iic0;
 		i2c7 = &iic1;
 		i2c8 = &iic3;
+		spi1 = &msiof0;
+		spi2 = &msiof1;
+		spi3 = &msiof2;
 	};
 
 	cpus {
@@ -779,6 +782,51 @@
 			status = "disabled";
 		};
 
+		msiof0: spi at e6e20000 {
+			compatible = "renesas,msiof-r8a7743",
+				     "renesas,rcar-gen2-msiof";
+			reg = <0 0xe6e20000 0 0x0064>;
+			interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp0_clks R8A7743_CLK_MSIOF0>;
+			dmas = <&dmac0 0x51>, <&dmac0 0x52>,
+			       <&dmac1 0x51>, <&dmac1 0x52>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&cpg_clocks>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
+		msiof1: spi at e6e10000 {
+			compatible = "renesas,msiof-r8a7743",
+				     "renesas,rcar-gen2-msiof";
+			reg = <0 0xe6e10000 0 0x0064>;
+			interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp2_clks R8A7743_CLK_MSIOF1>;
+			dmas = <&dmac0 0x55>, <&dmac0 0x56>,
+			       <&dmac1 0x55>, <&dmac1 0x56>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&cpg_clocks>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
+		msiof2: spi at e6e00000 {
+			compatible = "renesas,msiof-r8a7743",
+				     "renesas,rcar-gen2-msiof";
+			reg = <0 0xe6e00000 0 0x0064>;
+			interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp2_clks R8A7743_CLK_MSIOF2>;
+			dmas = <&dmac0 0x41>, <&dmac0 0x42>,
+			       <&dmac1 0x41>, <&dmac1 0x42>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&cpg_clocks>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
 		clocks {
 			#address-cells = <2>;
 			#size-cells = <2>;
-- 
2.7.4

[cip-dev] [PATCH 1/4] spi: sh-msiof: Add R-Car Gen 2 and 3 fallback bindings

[Ben Hutchings]

On Thu, 2018-03-08 at 17:28 +0000, Fabrizio Castro wrote:
> From: Simon Horman <horms+renesas@verge.net.au>
> 
> In the case of Renesas R-Car hardware we know that there are generations of
> SoCs, e.g. Gen 2 and Gen 3. But beyond that it's not clear what the
> relationship between IP blocks might be. For example, I believe that
> r8a7790 is older than r8a7791 but that doesn't imply that the latter is a
> descendant of the former or vice versa.
> 
> We can, however, by examining the documentation and behaviour of the
> hardware at run-time observe that the current driver implementation appears
> to be compatible with the IP blocks on SoCs within a given generation.
> 
> For the above reasons and convenience when enabling new SoCs a
> per-generation fallback compatibility string scheme is being adopted for
> drivers for Renesas SoCs.
> 
> Also:
> * Deprecate renesas,sh-msiof. It seems poorly named as it is only
> ? compatible with SH-Mobile. It also appears unused in mainline.
> 
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> (cherry picked from commit 4286db8456f4fa0c6af2b6b9abc5991a7e7da69c)
> Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> (cherry picked from commit 77f252646eb0ec1e78847fe5725c98ee9e70b39e)

I deleted this second commit reference, which I assume refers to some
private branch.

Ben.

> (removed "renesas,rcar-gen3-msiof")
> Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
[...]

-- 
Ben Hutchings
Software Developer, Codethink Ltd.

[cip-dev] [PATCH 0/4] Add MSIOF support to r8a7743

[Ben Hutchings]

I've applied this series, thanks.

Ben.

On Thu, 2018-03-08 at 17:28 +0000, Fabrizio Castro wrote:
> Dear All,
> 
> this series backports all that is required to add MSIOF support
> to r8a7743.
> 
> Thanks,
> 
> Fabrizio Castro (3):
> ? spi: sh-msiof: Add compatible strings for r8a774[35]
> ? spi: sh-msiof: Add r8a774[35] to the compatible list
> ? ARM: dts: r8a7743: Add MSIOF[012] support
> 
> Simon Horman (1):
> ? spi: sh-msiof: Add R-Car Gen 2 and 3 fallback bindings
> 
> ?Documentation/devicetree/bindings/spi/sh-msiof.txt | 18 +++++---
> ?arch/arm/boot/dts/r8a7743.dtsi?????????????????????| 48 ++++++++++++++++++++++
> ?drivers/spi/spi-sh-msiof.c?????????????????????????|??5 ++-
> ?3 files changed, 65 insertions(+), 6 deletions(-)
> 
-- 
Ben Hutchings
Software Developer, Codethink Ltd.

[cip-dev] [PATCH 1/4] spi: sh-msiof: Add R-Car Gen 2 and 3 fallback bindings

[Fabrizio Castro]

Hello Ben,

> Subject: Re: [cip-dev][PATCH 1/4] spi: sh-msiof: Add R-Car Gen 2 and 3 fallback bindings
>
> On Thu, 2018-03-08 at 17:28 +0000, Fabrizio Castro wrote:
> > From: Simon Horman <horms+renesas@verge.net.au>
> >
> > In the case of Renesas R-Car hardware we know that there are generations of
> > SoCs, e.g. Gen 2 and Gen 3. But beyond that it's not clear what the
> > relationship between IP blocks might be. For example, I believe that
> > r8a7790 is older than r8a7791 but that doesn't imply that the latter is a
> > descendant of the former or vice versa.
> >
> > We can, however, by examining the documentation and behaviour of the
> > hardware at run-time observe that the current driver implementation appears
> > to be compatible with the IP blocks on SoCs within a given generation.
> >
> > For the above reasons and convenience when enabling new SoCs a
> > per-generation fallback compatibility string scheme is being adopted for
> > drivers for Renesas SoCs.
> >
> > Also:
> > * Deprecate renesas,sh-msiof. It seems poorly named as it is only
> >   compatible with SH-Mobile. It also appears unused in mainline.
> >
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > Signed-off-by: Mark Brown <broonie@kernel.org>
> > (cherry picked from commit 4286db8456f4fa0c6af2b6b9abc5991a7e7da69c)
> > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > (cherry picked from commit 77f252646eb0ec1e78847fe5725c98ee9e70b39e)
>
> I deleted this second commit reference, which I assume refers to some
> private branch.

You are right, this must have been from a temporary local branch. Well spotted!

Thanks,
Fab

>
> Ben.
>
> > (removed "renesas,rcar-gen3-msiof")
> > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> [...]
>
> --
> Ben Hutchings
> Software Developer, Codethink Ltd.




Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.