[PATCH] spi: uniphier: fix incorrect property items

[PATCH] spi: uniphier: fix incorrect property items

[Keiji Hayashibara]

This commit fixes incorrect property because it was different
from the actual.
The parameters of '#address-cells' and '#size-cells' were removed,
and 'interrupts', 'pinctrl-names' and 'pinctrl-0' were added.

Fixes: 4dcd5c2781f3 ("spi: add DT bindings for UniPhier SPI controller")
Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com>
---
 Documentation/devicetree/bindings/spi/spi-uniphier.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/spi/spi-uniphier.txt b/Documentation/devicetree/bindings/spi/spi-uniphier.txt
index 504a4ec..b04e66a 100644
--- a/Documentation/devicetree/bindings/spi/spi-uniphier.txt
+++ b/Documentation/devicetree/bindings/spi/spi-uniphier.txt
@@ -5,18 +5,20 @@ UniPhier SoCs have SCSSI which supports SPI single channel.
 Required properties:
  - compatible: should be "socionext,uniphier-scssi"
  - reg: address and length of the spi master registers
- - #address-cells: must be <1>, see spi-bus.txt
- - #size-cells: must be <0>, see spi-bus.txt
- - clocks: A phandle to the clock for the device.
- - resets: A phandle to the reset control for the device.
+ - interrupts: a single interrupt specifier
+ - pinctrl-names: should be "default"
+ - pinctrl-0: pin control state for the default mode
+ - clocks: a phandle to the clock for the device
+ - resets: a phandle to the reset control for the device
 
 Example:
 
 spi0: spi@54006000 {
 	compatible = "socionext,uniphier-scssi";
 	reg = <0x54006000 0x100>;
-	#address-cells = <1>;
-	#size-cells = <0>;
+	interrupts = <0 39 4>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spi0>;
 	clocks = <&peri_clk 11>;
 	resets = <&peri_rst 11>;
 };
-- 
2.7.4

Applied "spi: uniphier: fix incorrect property items" to the spi tree

[Mark Brown]

The patch

   spi: uniphier: fix incorrect property items

has been applied to the spi tree at

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

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

From 3511ba7d4ca6f39e2d060bb94e42a41ad1fee7bf Mon Sep 17 00:00:00 2001
From: Keiji Hayashibara <hayashibara.keiji@socionext.com>
Date: Wed, 24 Oct 2018 18:34:29 +0900
Subject: [PATCH] spi: uniphier: fix incorrect property items

This commit fixes incorrect property because it was different
from the actual.
The parameters of '#address-cells' and '#size-cells' were removed,
and 'interrupts', 'pinctrl-names' and 'pinctrl-0' were added.

Fixes: 4dcd5c2781f3 ("spi: add DT bindings for UniPhier SPI controller")
Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 .../devicetree/bindings/spi/spi-uniphier.txt       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/spi/spi-uniphier.txt b/Documentation/devicetree/bindings/spi/spi-uniphier.txt
index 504a4ecfc7b1..b04e66a52de5 100644
--- a/Documentation/devicetree/bindings/spi/spi-uniphier.txt
+++ b/Documentation/devicetree/bindings/spi/spi-uniphier.txt
@@ -5,18 +5,20 @@ UniPhier SoCs have SCSSI which supports SPI single channel.
 Required properties:
  - compatible: should be "socionext,uniphier-scssi"
  - reg: address and length of the spi master registers
- - #address-cells: must be <1>, see spi-bus.txt
- - #size-cells: must be <0>, see spi-bus.txt
- - clocks: A phandle to the clock for the device.
- - resets: A phandle to the reset control for the device.
+ - interrupts: a single interrupt specifier
+ - pinctrl-names: should be "default"
+ - pinctrl-0: pin control state for the default mode
+ - clocks: a phandle to the clock for the device
+ - resets: a phandle to the reset control for the device
 
 Example:
 
 spi0: spi@54006000 {
 	compatible = "socionext,uniphier-scssi";
 	reg = <0x54006000 0x100>;
-	#address-cells = <1>;
-	#size-cells = <0>;
+	interrupts = <0 39 4>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spi0>;
 	clocks = <&peri_clk 11>;
 	resets = <&peri_rst 11>;
 };
-- 
2.19.0

Re: [PATCH] spi: uniphier: fix incorrect property items

[Rob Herring]

On Wed, Oct 24, 2018 at 06:34:29PM +0900, Keiji Hayashibara wrote:
> This commit fixes incorrect property because it was different
> from the actual.
> The parameters of '#address-cells' and '#size-cells' were removed,
> and 'interrupts', 'pinctrl-names' and 'pinctrl-0' were added.
> 
> Fixes: 4dcd5c2781f3 ("spi: add DT bindings for UniPhier SPI controller")
> Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com>
> ---
>  Documentation/devicetree/bindings/spi/spi-uniphier.txt | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/spi/spi-uniphier.txt b/Documentation/devicetree/bindings/spi/spi-uniphier.txt
> index 504a4ec..b04e66a 100644
> --- a/Documentation/devicetree/bindings/spi/spi-uniphier.txt
> +++ b/Documentation/devicetree/bindings/spi/spi-uniphier.txt
> @@ -5,18 +5,20 @@ UniPhier SoCs have SCSSI which supports SPI single channel.
>  Required properties:
>   - compatible: should be "socionext,uniphier-scssi"
>   - reg: address and length of the spi master registers
> - - #address-cells: must be <1>, see spi-bus.txt
> - - #size-cells: must be <0>, see spi-bus.txt

How is removing these correct? They are needed if you have any child 
devices.

> - - clocks: A phandle to the clock for the device.
> - - resets: A phandle to the reset control for the device.
> + - interrupts: a single interrupt specifier
> + - pinctrl-names: should be "default"
> + - pinctrl-0: pin control state for the default mode
> + - clocks: a phandle to the clock for the device
> + - resets: a phandle to the reset control for the device
>  
>  Example:
>  
>  spi0: spi@54006000 {
>  	compatible = "socionext,uniphier-scssi";
>  	reg = <0x54006000 0x100>;
> -	#address-cells = <1>;
> -	#size-cells = <0>;
> +	interrupts = <0 39 4>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_spi0>;
>  	clocks = <&peri_clk 11>;
>  	resets = <&peri_rst 11>;
>  };
> -- 
> 2.7.4
> 

RE: [PATCH] spi: uniphier: fix incorrect property items

[Keiji Hayashibara]

Hello Rob,

> -----Original Message-----
> From: Rob Herring [mailto:robh@kernel.org]
> Sent: Friday, October 26, 2018 4:59 AM
> To: Hayashibara, Keiji/林原 啓二 <hayashibara.keiji@socionext.com>
> Cc: broonie@kernel.org; mark.rutland@arm.com; Yamada, Masahiro/山田 真弘 <yamada.masahiro@socionext.com>;
> linux-spi@vger.kernel.org; linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org;
> stable@vger.kernel.org; masami.hiramatsu@linaro.org; jaswinder.singh@linaro.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH] spi: uniphier: fix incorrect property items
> 
> On Wed, Oct 24, 2018 at 06:34:29PM +0900, Keiji Hayashibara wrote:
> > This commit fixes incorrect property because it was different from the
> > actual.
> > The parameters of '#address-cells' and '#size-cells' were removed, and
> > 'interrupts', 'pinctrl-names' and 'pinctrl-0' were added.
> >
> > Fixes: 4dcd5c2781f3 ("spi: add DT bindings for UniPhier SPI
> > controller")
> > Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com>
> > ---
> >  Documentation/devicetree/bindings/spi/spi-uniphier.txt | 14
> > ++++++++------
> >  1 file changed, 8 insertions(+), 6 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/spi/spi-uniphier.txt
> > b/Documentation/devicetree/bindings/spi/spi-uniphier.txt
> > index 504a4ec..b04e66a 100644
> > --- a/Documentation/devicetree/bindings/spi/spi-uniphier.txt
> > +++ b/Documentation/devicetree/bindings/spi/spi-uniphier.txt
> > @@ -5,18 +5,20 @@ UniPhier SoCs have SCSSI which supports SPI single channel.
> >  Required properties:
> >   - compatible: should be "socionext,uniphier-scssi"
> >   - reg: address and length of the spi master registers
> > - - #address-cells: must be <1>, see spi-bus.txt
> > - - #size-cells: must be <0>, see spi-bus.txt
> 
> How is removing these correct? They are needed if you have any child devices.

They are necessary when the child device is connected.
I removed it because it was specified in spi-bus.txt,
but I will leave them in next patch.

> 
> > - - clocks: A phandle to the clock for the device.
> > - - resets: A phandle to the reset control for the device.
> > + - interrupts: a single interrupt specifier
> > + - pinctrl-names: should be "default"
> > + - pinctrl-0: pin control state for the default mode
> > + - clocks: a phandle to the clock for the device
> > + - resets: a phandle to the reset control for the device
> >
> >  Example:
> >
> >  spi0: spi@54006000 {
> >  	compatible = "socionext,uniphier-scssi";
> >  	reg = <0x54006000 0x100>;
> > -	#address-cells = <1>;
> > -	#size-cells = <0>;
> > +	interrupts = <0 39 4>;
> > +	pinctrl-names = "default";
> > +	pinctrl-0 = <&pinctrl_spi0>;
> >  	clocks = <&peri_clk 11>;
> >  	resets = <&peri_rst 11>;
> >  };
> > --
> > 2.7.4
> >

Thank you.

---
Best Regards,
Keiji Hayashibara