diff mbox series

arm64: dts: sun50i: sopine-baseboard: Expose serial1, serial2 and serial3

Message ID 20191012200524.23512-1-alistair@alistair23.me (mailing list archive)
State New, archived
Headers show
Series arm64: dts: sun50i: sopine-baseboard: Expose serial1, serial2 and serial3 | expand

Commit Message

Alistair Francis Oct. 12, 2019, 8:05 p.m. UTC
Follow what the sun50i-a64-pine64.dts does and expose all 5 serial
connections.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
 .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

Comments

Maxime Ripard Oct. 16, 2019, 2:49 p.m. UTC | #1
Hi,

On Sat, Oct 12, 2019 at 01:05:24PM -0700, Alistair Francis wrote:
> Follow what the sun50i-a64-pine64.dts does and expose all 5 serial
> connections.
>
> Signed-off-by: Alistair Francis <alistair@alistair23.me>
> ---
>  .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++
>  1 file changed, 25 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> index 124b0b030b28..49c37b21ab36 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> @@ -56,6 +56,10 @@
>  	aliases {
>  		ethernet0 = &emac;
>  		serial0 = &uart0;
> +		serial1 = &uart1;
> +		serial2 = &uart2;
> +		serial3 = &uart3;
> +		serial4 = &uart4;
>  	};
>
>  	chosen {
> @@ -280,6 +284,27 @@
>  	};
>  };
>
> +/* On Pi-2 connector */
> +&uart2 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart2_pins>;
> +	status = "disabled";
> +};
> +
> +/* On Euler connector */
> +&uart3 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart3_pins>;
> +	status = "disabled";
> +};
> +
> +/* On Euler connector, RTS/CTS optional */
> +&uart4 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart4_pins>;
> +	status = "disabled";
> +};

Since these are all the default muxing, maybe we should just set that
in the DTSI?

Maxime
Chen-Yu Tsai Oct. 16, 2019, 2:54 p.m. UTC | #2
On Wed, Oct 16, 2019 at 10:49 PM Maxime Ripard <mripard@kernel.org> wrote:
>
> Hi,
>
> On Sat, Oct 12, 2019 at 01:05:24PM -0700, Alistair Francis wrote:
> > Follow what the sun50i-a64-pine64.dts does and expose all 5 serial
> > connections.
> >
> > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > ---
> >  .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++
> >  1 file changed, 25 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > index 124b0b030b28..49c37b21ab36 100644
> > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > @@ -56,6 +56,10 @@
> >       aliases {
> >               ethernet0 = &emac;
> >               serial0 = &uart0;
> > +             serial1 = &uart1;
> > +             serial2 = &uart2;
> > +             serial3 = &uart3;
> > +             serial4 = &uart4;
> >       };
> >
> >       chosen {
> > @@ -280,6 +284,27 @@
> >       };
> >  };
> >
> > +/* On Pi-2 connector */
> > +&uart2 {
> > +     pinctrl-names = "default";
> > +     pinctrl-0 = <&uart2_pins>;
> > +     status = "disabled";
> > +};
> > +
> > +/* On Euler connector */
> > +&uart3 {
> > +     pinctrl-names = "default";
> > +     pinctrl-0 = <&uart3_pins>;
> > +     status = "disabled";
> > +};
> > +
> > +/* On Euler connector, RTS/CTS optional */
> > +&uart4 {
> > +     pinctrl-names = "default";
> > +     pinctrl-0 = <&uart4_pins>;
> > +     status = "disabled";
> > +};
>
> Since these are all the default muxing, maybe we should just set that
> in the DTSI?

Maybe not, since people may want to only use RX/TX, and leave the other
two pins for GPIO?

ChenYu
Alistair Francis Oct. 16, 2019, 4:10 p.m. UTC | #3
On Wed, Oct 16, 2019 at 7:54 AM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Wed, Oct 16, 2019 at 10:49 PM Maxime Ripard <mripard@kernel.org> wrote:
> >
> > Hi,
> >
> > On Sat, Oct 12, 2019 at 01:05:24PM -0700, Alistair Francis wrote:
> > > Follow what the sun50i-a64-pine64.dts does and expose all 5 serial
> > > connections.
> > >
> > > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > > ---
> > >  .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++
> > >  1 file changed, 25 insertions(+)
> > >
> > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > index 124b0b030b28..49c37b21ab36 100644
> > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > @@ -56,6 +56,10 @@
> > >       aliases {
> > >               ethernet0 = &emac;
> > >               serial0 = &uart0;
> > > +             serial1 = &uart1;
> > > +             serial2 = &uart2;
> > > +             serial3 = &uart3;
> > > +             serial4 = &uart4;
> > >       };
> > >
> > >       chosen {
> > > @@ -280,6 +284,27 @@
> > >       };
> > >  };
> > >
> > > +/* On Pi-2 connector */
> > > +&uart2 {
> > > +     pinctrl-names = "default";
> > > +     pinctrl-0 = <&uart2_pins>;
> > > +     status = "disabled";
> > > +};
> > > +
> > > +/* On Euler connector */
> > > +&uart3 {
> > > +     pinctrl-names = "default";
> > > +     pinctrl-0 = <&uart3_pins>;
> > > +     status = "disabled";
> > > +};
> > > +
> > > +/* On Euler connector, RTS/CTS optional */
> > > +&uart4 {
> > > +     pinctrl-names = "default";
> > > +     pinctrl-0 = <&uart4_pins>;
> > > +     status = "disabled";
> > > +};
> >
> > Since these are all the default muxing, maybe we should just set that
> > in the DTSI?
>
> Maybe not, since people may want to only use RX/TX, and leave the other
> two pins for GPIO?

I think this makes the most sense for the default.

Alistair

>
> ChenYu
Maxime Ripard Oct. 21, 2019, 11:17 a.m. UTC | #4
Hi,

On Wed, Oct 16, 2019 at 10:54:27PM +0800, Chen-Yu Tsai wrote:
> On Wed, Oct 16, 2019 at 10:49 PM Maxime Ripard <mripard@kernel.org> wrote:
> > On Sat, Oct 12, 2019 at 01:05:24PM -0700, Alistair Francis wrote:
> > > Follow what the sun50i-a64-pine64.dts does and expose all 5 serial
> > > connections.
> > >
> > > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > > ---
> > >  .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++
> > >  1 file changed, 25 insertions(+)
> > >
> > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > index 124b0b030b28..49c37b21ab36 100644
> > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > @@ -56,6 +56,10 @@
> > >       aliases {
> > >               ethernet0 = &emac;
> > >               serial0 = &uart0;
> > > +             serial1 = &uart1;
> > > +             serial2 = &uart2;
> > > +             serial3 = &uart3;
> > > +             serial4 = &uart4;
> > >       };
> > >
> > >       chosen {
> > > @@ -280,6 +284,27 @@
> > >       };
> > >  };
> > >
> > > +/* On Pi-2 connector */
> > > +&uart2 {
> > > +     pinctrl-names = "default";
> > > +     pinctrl-0 = <&uart2_pins>;
> > > +     status = "disabled";
> > > +};
> > > +
> > > +/* On Euler connector */
> > > +&uart3 {
> > > +     pinctrl-names = "default";
> > > +     pinctrl-0 = <&uart3_pins>;
> > > +     status = "disabled";
> > > +};
> > > +
> > > +/* On Euler connector, RTS/CTS optional */
> > > +&uart4 {
> > > +     pinctrl-names = "default";
> > > +     pinctrl-0 = <&uart4_pins>;
> > > +     status = "disabled";
> > > +};
> >
> > Since these are all the default muxing, maybe we should just set that
> > in the DTSI?
>
> Maybe not, since people may want to only use RX/TX, and leave the other
> two pins for GPIO?

Right, I'll apply that patch.

Thanks!
Maxime
Alistair Francis Nov. 5, 2019, 7:27 p.m. UTC | #5
On Mon, Oct 21, 2019 at 4:17 AM Maxime Ripard <mripard@kernel.org> wrote:
>
> Hi,
>
> On Wed, Oct 16, 2019 at 10:54:27PM +0800, Chen-Yu Tsai wrote:
> > On Wed, Oct 16, 2019 at 10:49 PM Maxime Ripard <mripard@kernel.org> wrote:
> > > On Sat, Oct 12, 2019 at 01:05:24PM -0700, Alistair Francis wrote:
> > > > Follow what the sun50i-a64-pine64.dts does and expose all 5 serial
> > > > connections.
> > > >
> > > > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > > > ---
> > > >  .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++
> > > >  1 file changed, 25 insertions(+)
> > > >
> > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > index 124b0b030b28..49c37b21ab36 100644
> > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > @@ -56,6 +56,10 @@
> > > >       aliases {
> > > >               ethernet0 = &emac;
> > > >               serial0 = &uart0;
> > > > +             serial1 = &uart1;
> > > > +             serial2 = &uart2;
> > > > +             serial3 = &uart3;
> > > > +             serial4 = &uart4;
> > > >       };
> > > >
> > > >       chosen {
> > > > @@ -280,6 +284,27 @@
> > > >       };
> > > >  };
> > > >
> > > > +/* On Pi-2 connector */
> > > > +&uart2 {
> > > > +     pinctrl-names = "default";
> > > > +     pinctrl-0 = <&uart2_pins>;
> > > > +     status = "disabled";
> > > > +};
> > > > +
> > > > +/* On Euler connector */
> > > > +&uart3 {
> > > > +     pinctrl-names = "default";
> > > > +     pinctrl-0 = <&uart3_pins>;
> > > > +     status = "disabled";
> > > > +};
> > > > +
> > > > +/* On Euler connector, RTS/CTS optional */
> > > > +&uart4 {
> > > > +     pinctrl-names = "default";
> > > > +     pinctrl-0 = <&uart4_pins>;
> > > > +     status = "disabled";
> > > > +};
> > >
> > > Since these are all the default muxing, maybe we should just set that
> > > in the DTSI?
> >
> > Maybe not, since people may want to only use RX/TX, and leave the other
> > two pins for GPIO?
>
> Right, I'll apply that patch.

Ping, just want to make sure this has been applied/will be applied.

Alistair

>
> Thanks!
> Maxime
Maxime Ripard Nov. 6, 2019, 11:52 a.m. UTC | #6
On Tue, Nov 05, 2019 at 11:27:42AM -0800, Alistair Francis wrote:
> On Mon, Oct 21, 2019 at 4:17 AM Maxime Ripard <mripard@kernel.org> wrote:
> >
> > Hi,
> >
> > On Wed, Oct 16, 2019 at 10:54:27PM +0800, Chen-Yu Tsai wrote:
> > > On Wed, Oct 16, 2019 at 10:49 PM Maxime Ripard <mripard@kernel.org> wrote:
> > > > On Sat, Oct 12, 2019 at 01:05:24PM -0700, Alistair Francis wrote:
> > > > > Follow what the sun50i-a64-pine64.dts does and expose all 5 serial
> > > > > connections.
> > > > >
> > > > > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > > > > ---
> > > > >  .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++
> > > > >  1 file changed, 25 insertions(+)
> > > > >
> > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > > index 124b0b030b28..49c37b21ab36 100644
> > > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > > @@ -56,6 +56,10 @@
> > > > >       aliases {
> > > > >               ethernet0 = &emac;
> > > > >               serial0 = &uart0;
> > > > > +             serial1 = &uart1;
> > > > > +             serial2 = &uart2;
> > > > > +             serial3 = &uart3;
> > > > > +             serial4 = &uart4;
> > > > >       };
> > > > >
> > > > >       chosen {
> > > > > @@ -280,6 +284,27 @@
> > > > >       };
> > > > >  };
> > > > >
> > > > > +/* On Pi-2 connector */
> > > > > +&uart2 {
> > > > > +     pinctrl-names = "default";
> > > > > +     pinctrl-0 = <&uart2_pins>;
> > > > > +     status = "disabled";
> > > > > +};
> > > > > +
> > > > > +/* On Euler connector */
> > > > > +&uart3 {
> > > > > +     pinctrl-names = "default";
> > > > > +     pinctrl-0 = <&uart3_pins>;
> > > > > +     status = "disabled";
> > > > > +};
> > > > > +
> > > > > +/* On Euler connector, RTS/CTS optional */
> > > > > +&uart4 {
> > > > > +     pinctrl-names = "default";
> > > > > +     pinctrl-0 = <&uart4_pins>;
> > > > > +     status = "disabled";
> > > > > +};
> > > >
> > > > Since these are all the default muxing, maybe we should just set that
> > > > in the DTSI?
> > >
> > > Maybe not, since people may want to only use RX/TX, and leave the other
> > > two pins for GPIO?
> >
> > Right, I'll apply that patch.
>
> Ping, just want to make sure this has been applied/will be applied.

This has been applied, and was part of the PR for 5.5 sent last week

Maxime
Alistair Francis Nov. 6, 2019, 9:45 p.m. UTC | #7
On Wed, Nov 6, 2019 at 3:52 AM Maxime Ripard <mripard@kernel.org> wrote:
>
> On Tue, Nov 05, 2019 at 11:27:42AM -0800, Alistair Francis wrote:
> > On Mon, Oct 21, 2019 at 4:17 AM Maxime Ripard <mripard@kernel.org> wrote:
> > >
> > > Hi,
> > >
> > > On Wed, Oct 16, 2019 at 10:54:27PM +0800, Chen-Yu Tsai wrote:
> > > > On Wed, Oct 16, 2019 at 10:49 PM Maxime Ripard <mripard@kernel.org> wrote:
> > > > > On Sat, Oct 12, 2019 at 01:05:24PM -0700, Alistair Francis wrote:
> > > > > > Follow what the sun50i-a64-pine64.dts does and expose all 5 serial
> > > > > > connections.
> > > > > >
> > > > > > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > > > > > ---
> > > > > >  .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++
> > > > > >  1 file changed, 25 insertions(+)
> > > > > >
> > > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > > > index 124b0b030b28..49c37b21ab36 100644
> > > > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > > > > > @@ -56,6 +56,10 @@
> > > > > >       aliases {
> > > > > >               ethernet0 = &emac;
> > > > > >               serial0 = &uart0;
> > > > > > +             serial1 = &uart1;
> > > > > > +             serial2 = &uart2;
> > > > > > +             serial3 = &uart3;
> > > > > > +             serial4 = &uart4;
> > > > > >       };
> > > > > >
> > > > > >       chosen {
> > > > > > @@ -280,6 +284,27 @@
> > > > > >       };
> > > > > >  };
> > > > > >
> > > > > > +/* On Pi-2 connector */
> > > > > > +&uart2 {
> > > > > > +     pinctrl-names = "default";
> > > > > > +     pinctrl-0 = <&uart2_pins>;
> > > > > > +     status = "disabled";
> > > > > > +};
> > > > > > +
> > > > > > +/* On Euler connector */
> > > > > > +&uart3 {
> > > > > > +     pinctrl-names = "default";
> > > > > > +     pinctrl-0 = <&uart3_pins>;
> > > > > > +     status = "disabled";
> > > > > > +};
> > > > > > +
> > > > > > +/* On Euler connector, RTS/CTS optional */
> > > > > > +&uart4 {
> > > > > > +     pinctrl-names = "default";
> > > > > > +     pinctrl-0 = <&uart4_pins>;
> > > > > > +     status = "disabled";
> > > > > > +};
> > > > >
> > > > > Since these are all the default muxing, maybe we should just set that
> > > > > in the DTSI?
> > > >
> > > > Maybe not, since people may want to only use RX/TX, and leave the other
> > > > two pins for GPIO?
> > >
> > > Right, I'll apply that patch.
> >
> > Ping, just want to make sure this has been applied/will be applied.
>
> This has been applied, and was part of the PR for 5.5 sent last week

Thanks :)

Alistair

>
> Maxime
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 124b0b030b28..49c37b21ab36 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -56,6 +56,10 @@ 
 	aliases {
 		ethernet0 = &emac;
 		serial0 = &uart0;
+		serial1 = &uart1;
+		serial2 = &uart2;
+		serial3 = &uart3;
+		serial4 = &uart4;
 	};
 
 	chosen {
@@ -280,6 +284,27 @@ 
 	};
 };
 
+/* On Pi-2 connector */
+&uart2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart2_pins>;
+	status = "disabled";
+};
+
+/* On Euler connector */
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_pins>;
+	status = "disabled";
+};
+
+/* On Euler connector, RTS/CTS optional */
+&uart4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart4_pins>;
+	status = "disabled";
+};
+
 &usb_otg {
 	dr_mode = "host";
 	status = "okay";