2021-10-14 11:35:09

by Anatolij Gustschin

Subject: [PATCH] powerpc/mpc512x: dts: fix PSC node warnings

Fix build warnings like:
mpc5121.dtsi:397.13-406.5: Warning (spi_bus_bridge): /soc@80000000/psc@11400: node name for SPI buses should be 'spi'
mpc5121.dtsi:409.13-418.5: Warning (spi_bus_bridge): /soc@80000000/psc@11500: node name for SPI buses should be 'spi'
mpc5121.dtsi:457.13-466.5: Warning (spi_bus_bridge): /soc@80000000/psc@11900: node name for SPI buses should be 'spi'

Signed-off-by: Anatolij Gustschin <[email protected]>
---
arch/powerpc/boot/dts/ac14xx.dts | 17 +++++++++++++++--
arch/powerpc/boot/dts/pdm360ng.dts | 11 ++++++++++-
2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
index 5d8877e1f4ad..662d7aa2e4e8 100644
--- a/arch/powerpc/boot/dts/ac14xx.dts
+++ b/arch/powerpc/boot/dts/ac14xx.dts
@@ -301,13 +301,21 @@
fsl,tx-fifo-size = <512>;
};

+ /delete-node/ psc@11400;
+ /delete-node/ psc@11500;
+
/* PSC4 in SPI mode */
- spi4: psc@11400 {
+ spi4: spi@11400 {
compatible = "fsl,mpc5121-psc-spi", "fsl,mpc5121-psc";
+ reg = <0x11400 0x100>;
fsl,rx-fifo-size = <768>;
fsl,tx-fifo-size = <768>;
#address-cells = <1>;
#size-cells = <0>;
+ interrupts = <40 0x8>;
+ clocks = <&clks MPC512x_CLK_PSC4>,
+ <&clks MPC512x_CLK_PSC4_MCLK>;
+ clock-names = "ipg", "mclk";
num-cs = <1>;
cs-gpios = <&gpio_pic 25 0>;

@@ -326,13 +334,18 @@
};

/* PSC5 in SPI mode */
- spi5: psc@11500 {
+ spi5: spi@11500 {
compatible = "fsl,mpc5121-psc-spi", "fsl,mpc5121-psc";
+ reg = <0x11500 0x100>;
fsl,mode = "spi-master";
fsl,rx-fifo-size = <128>;
fsl,tx-fifo-size = <128>;
#address-cells = <1>;
#size-cells = <0>;
+ interrupts = <40 0x8>;
+ clocks = <&clks MPC512x_CLK_PSC5>,
+ <&clks MPC512x_CLK_PSC5_MCLK>;
+ clock-names = "ipg", "mclk";

lcd@0 {
compatible = "ilitek,ili922x";
diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
index 67c3b9db75d7..2733d15079a9 100644
--- a/arch/powerpc/boot/dts/pdm360ng.dts
+++ b/arch/powerpc/boot/dts/pdm360ng.dts
@@ -169,10 +169,19 @@
compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
};

- psc@11900 {
+ /delete-node/ psc@11900;
+
+ spi@11900 {
compatible = "fsl,mpc5121-psc-spi", "fsl,mpc5121-psc";
+ reg = <0x11900 0x100>;
#address-cells = <1>;
#size-cells = <0>;
+ interrupts = <40 0x8>;
+ fsl,rx-fifo-size = <16>;
+ fsl,tx-fifo-size = <16>;
+ clocks = <&clks MPC512x_CLK_PSC9>,
+ <&clks MPC512x_CLK_PSC9_MCLK>;
+ clock-names = "ipg", "mclk";

/* ADS7845 touch screen controller */
ts@0 {
--
2.17.1

2021-10-14 14:27:46

by Rob Herring

Subject: Re: [PATCH] powerpc/mpc512x: dts: fix PSC node warnings

On Thu, Oct 14, 2021 at 6:31 AM Anatolij Gustschin <[email protected]> wrote:
>
> Fix build warnings like:
> mpc5121.dtsi:397.13-406.5: Warning (spi_bus_bridge): /soc@80000000/psc@11400: node name for SPI buses should be 'spi'
> mpc5121.dtsi:409.13-418.5: Warning (spi_bus_bridge): /soc@80000000/psc@11500: node name for SPI buses should be 'spi'
> mpc5121.dtsi:457.13-466.5: Warning (spi_bus_bridge): /soc@80000000/psc@11900: node name for SPI buses should be 'spi'
>
> Signed-off-by: Anatolij Gustschin <[email protected]>
> ---
> arch/powerpc/boot/dts/ac14xx.dts | 17 +++++++++++++++--
> arch/powerpc/boot/dts/pdm360ng.dts | 11 ++++++++++-
> 2 files changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
> index 5d8877e1f4ad..662d7aa2e4e8 100644
> --- a/arch/powerpc/boot/dts/ac14xx.dts
> +++ b/arch/powerpc/boot/dts/ac14xx.dts
> @@ -301,13 +301,21 @@
> fsl,tx-fifo-size = <512>;
> };
>
> + /delete-node/ psc@11400;
> + /delete-node/ psc@11500;

That's an odd way to fix this, and means every user of the .dtsi file
with these nodes will have to repeat the same thing.

> +
> /* PSC4 in SPI mode */
> - spi4: psc@11400 {
> + spi4: spi@11400 {
> compatible = "fsl,mpc5121-psc-spi", "fsl,mpc5121-psc";
> + reg = <0x11400 0x100>;
> fsl,rx-fifo-size = <768>;
> fsl,tx-fifo-size = <768>;
> #address-cells = <1>;
> #size-cells = <0>;
> + interrupts = <40 0x8>;
> + clocks = <&clks MPC512x_CLK_PSC4>,
> + <&clks MPC512x_CLK_PSC4_MCLK>;
> + clock-names = "ipg", "mclk";
> num-cs = <1>;
> cs-gpios = <&gpio_pic 25 0>;
>
> @@ -326,13 +334,18 @@
> };
>
> /* PSC5 in SPI mode */
> - spi5: psc@11500 {
> + spi5: spi@11500 {
> compatible = "fsl,mpc5121-psc-spi", "fsl,mpc5121-psc";
> + reg = <0x11500 0x100>;
> fsl,mode = "spi-master";
> fsl,rx-fifo-size = <128>;
> fsl,tx-fifo-size = <128>;
> #address-cells = <1>;
> #size-cells = <0>;
> + interrupts = <40 0x8>;
> + clocks = <&clks MPC512x_CLK_PSC5>,
> + <&clks MPC512x_CLK_PSC5_MCLK>;
> + clock-names = "ipg", "mclk";
>
> lcd@0 {
> compatible = "ilitek,ili922x";
> diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
> index 67c3b9db75d7..2733d15079a9 100644
> --- a/arch/powerpc/boot/dts/pdm360ng.dts
> +++ b/arch/powerpc/boot/dts/pdm360ng.dts
> @@ -169,10 +169,19 @@
> compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
> };
>
> - psc@11900 {
> + /delete-node/ psc@11900;
> +
> + spi@11900 {
> compatible = "fsl,mpc5121-psc-spi", "fsl,mpc5121-psc";
> + reg = <0x11900 0x100>;
> #address-cells = <1>;
> #size-cells = <0>;
> + interrupts = <40 0x8>;
> + fsl,rx-fifo-size = <16>;
> + fsl,tx-fifo-size = <16>;
> + clocks = <&clks MPC512x_CLK_PSC9>,
> + <&clks MPC512x_CLK_PSC9_MCLK>;
> + clock-names = "ipg", "mclk";
>
> /* ADS7845 touch screen controller */
> ts@0 {
> --
> 2.17.1
>

2021-10-15 07:07:26

by Anatolij Gustschin

Subject: Re: [PATCH] powerpc/mpc512x: dts: fix PSC node warnings

On Thu, 14 Oct 2021 07:33:26 -0500
Rob Herring [email protected] wrote:
...
>> +++ b/arch/powerpc/boot/dts/ac14xx.dts
>> @@ -301,13 +301,21 @@
>> fsl,tx-fifo-size = <512>;
>> };
>>
>> + /delete-node/ psc@11400;
>> + /delete-node/ psc@11500;
>
>That's an odd way to fix this, and means every user of the .dtsi file
>with these nodes will have to repeat the same thing.

okay, in v2 patch I've extracted the psc nodes to files which
can be included and extended individually.

Anatolij