diff mbox series

dt-bindings: spi: dw-apb-ssi: Integrate Renesas RZ/N1 SPI controller

Message ID aef15aa119ed02487ded4691141678bc1040c3b4.1620301936.git.geert+renesas@glider.be (mailing list archive)
State Accepted
Delegated to: Geert Uytterhoeven
Headers show
Series dt-bindings: spi: dw-apb-ssi: Integrate Renesas RZ/N1 SPI controller | expand

Commit Message

Geert Uytterhoeven May 6, 2021, 11:52 a.m. UTC
Originally, the Renesas RZ/N1 SPI Controller DT bindings were not
integrated in the main DT bindings for the Synopsys DesignWare
Synchronous Serial Interface, but in its own file, as the RZ/N1
controller has additional registers for software CS control and DMA.

As so far DMA is not supported on RZ/N1, and json-schema can handle any
possible differences fine, integrate the RZ/N1 compatible values in the
main DT bindings for the Synopsys DW SSI.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
There are no upstream users of this binding, but it validates the
following (modified) example taken from the RZ/N1 BSP[1] fine:

    spi0: spi@50005000 {
	    compatible = "renesas,r9a06g032-spi", "renesas,rzn1-spi";
	    reg = <0x50005000 0x400>;
	    interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
	    clock-names = "ssi_clk", "pclk";
	    clocks = <&sysctrl R9A06G032_CLK_SPI0>, <&sysctrl R9A06G032_HCLK_SPI0>;
	    #address-cells = <1>;
	    #size-cells = <0>;
	    spi-max-frequency = <12500000>;
	    num-cs = <4>;
    };

[1] https://github.com/renesas-rz/rzn1_linux/blob/rzn1-stable-v4.19/arch/arm/boot/dts/rzn1.dtsi
---
 .../devicetree/bindings/spi/renesas,rzn1-spi.txt      | 11 -----------
 .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml      |  6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt

Comments

Rob Herring May 7, 2021, 10:13 p.m. UTC | #1
On Thu, 06 May 2021 13:52:59 +0200, Geert Uytterhoeven wrote:
> Originally, the Renesas RZ/N1 SPI Controller DT bindings were not
> integrated in the main DT bindings for the Synopsys DesignWare
> Synchronous Serial Interface, but in its own file, as the RZ/N1
> controller has additional registers for software CS control and DMA.
> 
> As so far DMA is not supported on RZ/N1, and json-schema can handle any
> possible differences fine, integrate the RZ/N1 compatible values in the
> main DT bindings for the Synopsys DW SSI.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> There are no upstream users of this binding, but it validates the
> following (modified) example taken from the RZ/N1 BSP[1] fine:
> 
>     spi0: spi@50005000 {
> 	    compatible = "renesas,r9a06g032-spi", "renesas,rzn1-spi";
> 	    reg = <0x50005000 0x400>;
> 	    interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
> 	    clock-names = "ssi_clk", "pclk";
> 	    clocks = <&sysctrl R9A06G032_CLK_SPI0>, <&sysctrl R9A06G032_HCLK_SPI0>;
> 	    #address-cells = <1>;
> 	    #size-cells = <0>;
> 	    spi-max-frequency = <12500000>;
> 	    num-cs = <4>;
>     };
> 
> [1] https://github.com/renesas-rz/rzn1_linux/blob/rzn1-stable-v4.19/arch/arm/boot/dts/rzn1.dtsi
> ---
>  .../devicetree/bindings/spi/renesas,rzn1-spi.txt      | 11 -----------
>  .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml      |  6 ++++++
>  2 files changed, 6 insertions(+), 11 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Mark Brown May 11, 2021, 8:25 a.m. UTC | #2
On Thu, 6 May 2021 13:52:59 +0200, Geert Uytterhoeven wrote:
> Originally, the Renesas RZ/N1 SPI Controller DT bindings were not
> integrated in the main DT bindings for the Synopsys DesignWare
> Synchronous Serial Interface, but in its own file, as the RZ/N1
> controller has additional registers for software CS control and DMA.
> 
> As so far DMA is not supported on RZ/N1, and json-schema can handle any
> possible differences fine, integrate the RZ/N1 compatible values in the
> main DT bindings for the Synopsys DW SSI.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] dt-bindings: spi: dw-apb-ssi: Integrate Renesas RZ/N1 SPI controller
      commit: 029d32a892a860017d33ff8d9598259731e776ad

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt b/Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
deleted file mode 100644
index fb1a6728638d3e2f..0000000000000000
--- a/Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
+++ /dev/null
@@ -1,11 +0,0 @@ 
-Renesas RZ/N1 SPI Controller
-
-This controller is based on the Synopsys DW Synchronous Serial Interface and
-inherits all properties defined in snps,dw-apb-ssi.txt except for the
-compatible property.
-
-Required properties:
-- compatible : The device specific string followed by the generic RZ/N1 string.
-   Therefore it must be one of:
-   "renesas,r9a06g032-spi", "renesas,rzn1-spi"
-   "renesas,r9a06g033-spi", "renesas,rzn1-spi"
diff --git a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
index 4825157cd92e8262..ca91201a99269750 100644
--- a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
+++ b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
@@ -67,6 +67,12 @@  properties:
         const: baikal,bt1-sys-ssi
       - description: Canaan Kendryte K210 SoS SPI Controller
         const: canaan,k210-spi
+      - description: Renesas RZ/N1 SPI Controller
+        items:
+          - enum:
+              - renesas,r9a06g032-spi # RZ/N1D
+              - renesas,r9a06g033-spi # RZ/N1S
+          - const: renesas,rzn1-spi   # RZ/N1
 
   reg:
     minItems: 1