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

[Rob Herring]

On Thu, Oct 14, 2021 at 5:42 PM Anatolij Gustschin <agust@xxxxxxx> wrote:
>
> Rework PSC node description to 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'

Okay, I now see the block supports either spi or serial modes. I would
handle this a bit differently that doesn't create a bunch of new .dtsi
files.

>
> Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
> ---
> Changes in v2:
>  - extract PSC nodes to files which can be included
>    separately and extended as needed
>
>  arch/powerpc/boot/dts/ac14xx.dts            | 118 ++++++++--------
>  arch/powerpc/boot/dts/mpc5121-psc0.dtsi     |  16 +++
>  arch/powerpc/boot/dts/mpc5121-psc1.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc10.dtsi    |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc11.dtsi    |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc2.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc3.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc4-spi.dtsi |  17 +++
>  arch/powerpc/boot/dts/mpc5121-psc4.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc5-spi.dtsi |  17 +++
>  arch/powerpc/boot/dts/mpc5121-psc5.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc6.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc7.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc8.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121-psc9-spi.dtsi |  17 +++
>  arch/powerpc/boot/dts/mpc5121-psc9.dtsi     |  15 ++
>  arch/powerpc/boot/dts/mpc5121.dtsi          | 148 +-------------------
>  arch/powerpc/boot/dts/mpc5121ads.dts        |  42 +++---
>  arch/powerpc/boot/dts/pdm360ng.dts          | 104 +++++++-------
>  19 files changed, 371 insertions(+), 273 deletions(-)
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc0.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc1.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc10.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc11.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc2.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc3.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc4-spi.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc4.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc5-spi.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc5.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc6.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc7.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc8.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc9-spi.dtsi
>  create mode 100644 arch/powerpc/boot/dts/mpc5121-psc9.dtsi

[...]

> diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi
> index 3f66b91a8e3c..21674da8beb1 100644
> --- a/arch/powerpc/boot/dts/mpc5121.dtsi
> +++ b/arch/powerpc/boot/dts/mpc5121.dtsi
> @@ -87,7 +87,7 @@
>                 };
>         };
>
> -       soc@80000000 {
> +       soc: soc@80000000 {
>                 compatible = "fsl,mpc5121-immr";
>                 #address-cells = <1>;
>                 #size-cells = <1>;
> @@ -343,152 +343,6 @@
>                         clock-names = "ipg";
>                 };
>
> -               /* 512x PSCs are not 52xx PSC compatible */
> -
> -               /* PSC0 */
> -               psc@11000 {

I would just put here 'serial@11000' and 'spi@11000' nodes with both
nodes set to disabled. Then the board dts just has to change status of
the the nodes it wants to enable (and add child nodes for spi).
Overlapping addresses are okay if nodes are disabled.

> -                       compatible = "fsl,mpc5121-psc";
> -                       reg = <0x11000 0x100>;
> -                       interrupts = <40 0x8>;
> -                       fsl,rx-fifo-size = <16>;
> -                       fsl,tx-fifo-size = <16>;
> -                       clocks = <&clks MPC512x_CLK_PSC0>,
> -                                <&clks MPC512x_CLK_PSC0_MCLK>;
> -                       clock-names = "ipg", "mclk";
> -               };