diff mbox series

[4/4] arm64: dts: renesas: rzg2lc-smarc: Enable RSPI1 on carrier board

Message ID 20220307192436.13237-5-biju.das.jz@bp.renesas.com
State New
Headers show
Series Enable RZ/G2LC OSTM, QSPI0, RSPI and Voltage regulator for GPU | expand

Commit Message

Biju Das March 7, 2022, 7:24 p.m. UTC
RSPI1 (SPI1) interface is available on PMOD0 connector (J1) on the
carrier board.  This patch adds pinmux and spi1 nodes to the carrier
board dtsi file and drops deleting pinctl* properties from DTS file.

RSPI1 interface is tested by setting the macro SW_RSPI_CAN to 0.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
 arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts         | 6 ------
 arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 7 +++++++
 arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi             | 8 ++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

Comments

Geert Uytterhoeven March 18, 2022, 1:15 p.m. UTC | #1
Hi Biju,

On Mon, Mar 7, 2022 at 8:24 PM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> RSPI1 (SPI1) interface is available on PMOD0 connector (J1) on the
> carrier board.  This patch adds pinmux and spi1 nodes to the carrier
> board dtsi file and drops deleting pinctl* properties from DTS file.
>
> RSPI1 interface is tested by setting the macro SW_RSPI_CAN to 0.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

Thanks for your patch!

> --- a/arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
> +++ b/arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
> @@ -13,9 +13,3 @@
>         model = "Renesas SMARC EVK based on r9a07g044c2";
>         compatible = "renesas,smarc-evk", "renesas,r9a07g044c2", "renesas,r9a07g044";
>  };
> -
> -&spi1 {
> -       /delete-property/ pinctrl-0;
> -       /delete-property/ pinctrl-names;
> -       status = "disabled";
> -};

The common properties in rz-smarc-common.dtsi are indeed no
longer removed...

> --- a/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
> +++ b/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
> @@ -74,6 +74,14 @@
>         };
>  };
>
> +#if (!SW_RSPI_CAN)
> +&spi1 {

Spi1 should be inserted after scif1 below.

> +       pinctrl-0 = <&spi1_pins>;
> +       pinctrl-names = "default";
> +       status = "okay";
> +};
> +#endif

... so regardless of the value of SW_RSPI_CAN, spi1 will be enabled?

I think you want to protect the disable block in r9a07g044c2-smarc.dts
by #if SW_RSPI_CAN/#endif instead?

  + #if SW_RSPI_CAN
    &spi1 {
           /delete-property/ pinctrl-0;
           /delete-property/ pinctrl-names;
           status = "disabled";
    };
  + #endif

> +
>  /*
>   * To enable SCIF1 (SER0) on PMOD1 (CN7), On connector board
>   * SW1 should be at position 2->3 so that SER0_CTS# line is activated

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Biju Das March 18, 2022, 1:24 p.m. UTC | #2
Hi Geert,

Thanks for the feedback.

> Subject: Re: [PATCH 4/4] arm64: dts: renesas: rzg2lc-smarc: Enable RSPI1
> on carrier board
> 
> Hi Biju,
> 
> On Mon, Mar 7, 2022 at 8:24 PM Biju Das <biju.das.jz@bp.renesas.com>
> wrote:
> > RSPI1 (SPI1) interface is available on PMOD0 connector (J1) on the
> > carrier board.  This patch adds pinmux and spi1 nodes to the carrier
> > board dtsi file and drops deleting pinctl* properties from DTS file.
> >
> > RSPI1 interface is tested by setting the macro SW_RSPI_CAN to 0.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> 
> Thanks for your patch!
> 
> > --- a/arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
> > +++ b/arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
> > @@ -13,9 +13,3 @@
> >         model = "Renesas SMARC EVK based on r9a07g044c2";
> >         compatible = "renesas,smarc-evk", "renesas,r9a07g044c2",
> > "renesas,r9a07g044";  };
> > -
> > -&spi1 {
> > -       /delete-property/ pinctrl-0;
> > -       /delete-property/ pinctrl-names;
> > -       status = "disabled";
> > -};
> 
> The common properties in rz-smarc-common.dtsi are indeed no longer
> removed...
> 
> > --- a/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
> > @@ -74,6 +74,14 @@
> >         };
> >  };
> >
> > +#if (!SW_RSPI_CAN)
> > +&spi1 {
> 
> Spi1 should be inserted after scif1 below.

Agreed.

> 
> > +       pinctrl-0 = <&spi1_pins>;
> > +       pinctrl-names = "default";
> > +       status = "okay";
> > +};
> > +#endif
> 
> ... so regardless of the value of SW_RSPI_CAN, spi1 will be enabled?
> 
> I think you want to protect the disable block in r9a07g044c2-smarc.dts by

OK, will fix this in next version.


Cheers,
Biju

> #if SW_RSPI_CAN/#endif instead?
> 
>   + #if SW_RSPI_CAN
>     &spi1 {
>            /delete-property/ pinctrl-0;
>            /delete-property/ pinctrl-names;
>            status = "disabled";
>     };
>   + #endif
> 
> > +
> >  /*
> >   * To enable SCIF1 (SER0) on PMOD1 (CN7), On connector board
> >   * SW1 should be at position 2->3 so that SER0_CTS# line is activated
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-
> m68k.org
> 
> In personal conversations with technical people, I call myself a hacker.
> But when I'm talking to journalists I just say "programmer" or something
> like that.
>                                 -- Linus Torvalds
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts b/arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
index 74a2f2bade10..fc34058002e2 100644
--- a/arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
+++ b/arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
@@ -13,9 +13,3 @@ 
 	model = "Renesas SMARC EVK based on r9a07g044c2";
 	compatible = "renesas,smarc-evk", "renesas,r9a07g044c2", "renesas,r9a07g044";
 };
-
-&spi1 {
-	/delete-property/ pinctrl-0;
-	/delete-property/ pinctrl-names;
-	status = "disabled";
-};
diff --git a/arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi b/arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi
index d275a55333e3..a78a8def363e 100644
--- a/arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi
+++ b/arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi
@@ -106,6 +106,13 @@ 
 		input-enable;
 	};
 
+	spi1_pins: spi1 {
+		pinmux = <RZG2L_PORT_PINMUX(44, 0, 1)>, /* CK */
+			 <RZG2L_PORT_PINMUX(44, 1, 1)>, /* MOSI */
+			 <RZG2L_PORT_PINMUX(44, 2, 1)>, /* MISO */
+			 <RZG2L_PORT_PINMUX(44, 3, 1)>; /* SSL */
+	};
+
 	ssi0_pins: ssi0 {
 		pinmux = <RZG2L_PORT_PINMUX(45, 0, 1)>, /* BCK */
 			 <RZG2L_PORT_PINMUX(45, 1, 1)>, /* RCK */
diff --git a/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi b/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
index f73b4acb8f9e..292513635baf 100644
--- a/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
+++ b/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
@@ -74,6 +74,14 @@ 
 	};
 };
 
+#if (!SW_RSPI_CAN)
+&spi1 {
+	pinctrl-0 = <&spi1_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+#endif
+
 /*
  * To enable SCIF1 (SER0) on PMOD1 (CN7), On connector board
  * SW1 should be at position 2->3 so that SER0_CTS# line is activated