diff mbox

ARM: shmobile: r8a7790: switch from scif to scifa

Message ID 1410883837-5611-1-git-send-email-wsa@the-dreams.de (mailing list archive)
State Accepted
Commit 7c05589413fa9902f2843e91845d6084f6f8e2cd
Headers show

Commit Message

Wolfram Sang Sept. 16, 2014, 4:10 p.m. UTC
From: Wolfram Sang <wsa+renesas@sang-engineering.com>

SCIF and SCIFA can be plexed onto the same wires on Lager board. The
datasheet also describes the wires as SCIFA. So, to make use of the
bigger FIFOs switch to SCIFA instead.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Currently, I use this patch to check if the DMA RX issue is the same on SCIF
and SCIFA (yes, it is). However, I still think it makes sense to use the bigger
FIFOs. I will check this next week with Bastian's FIFO patches. Until then, I
send this as RFC to collect opinions speaking for/against this change.

 arch/arm/boot/dts/r8a7790-lager.dts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Laurent Pinchart Sept. 17, 2014, 2:40 p.m. UTC | #1
Hi Wolfram,

On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> 
> SCIF and SCIFA can be plexed onto the same wires on Lager board. The
> datasheet also describes the wires as SCIFA. So, to make use of the
> bigger FIFOs switch to SCIFA instead.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
> 
> Currently, I use this patch to check if the DMA RX issue is the same on SCIF
> and SCIFA (yes, it is). However, I still think it makes sense to use the
> bigger FIFOs. I will check this next week with Bastian's FIFO patches.
> Until then, I send this as RFC to collect opinions speaking for/against
> this change.

I have nothing against this change, but I believe the aliases should now be 
serial0 and serial1 to match the legacy code (OK, that's a lame excuse, we all 
know that I just want to change the aliases ;-)).

>  arch/arm/boot/dts/r8a7790-lager.dts | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> b/arch/arm/boot/dts/r8a7790-lager.dts index 84dcafa7179b..782f0aa938b3
> 100644
> --- a/arch/arm/boot/dts/r8a7790-lager.dts
> +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> @@ -19,8 +19,8 @@
>  	compatible = "renesas,lager", "renesas,r8a7790";
> 
>  	aliases {
> -		serial6 = &scif0;
> -		serial7 = &scif1;
> +		serial6 = &scifa0;
> +		serial7 = &scifa1;
>  	};
> 
>  	chosen {
> @@ -159,9 +159,9 @@
>  		renesas,function = "du";
>  	};
> 
> -	scif0_pins: serial0 {
> -		renesas,groups = "scif0_data";
> -		renesas,function = "scif0";
> +	scifa0_pins: serial0 {
> +		renesas,groups = "scifa0_data";
> +		renesas,function = "scifa0";
>  	};
> 
>  	ether_pins: ether {
> @@ -174,9 +174,9 @@
>  		renesas,function = "intc";
>  	};
> 
> -	scif1_pins: serial1 {
> -		renesas,groups = "scif1_data";
> -		renesas,function = "scif1";
> +	scifa1_pins: serial1 {
> +		renesas,groups = "scifa1_data";
> +		renesas,function = "scifa1";
>  	};
> 
>  	sdhi0_pins: sd0 {
> @@ -308,15 +308,15 @@
>  	};
>  };
> 
> -&scif0 {
> -	pinctrl-0 = <&scif0_pins>;
> +&scifa0 {
> +	pinctrl-0 = <&scifa0_pins>;
>  	pinctrl-names = "default";
> 
>  	status = "okay";
>  };
> 
> -&scif1 {
> -	pinctrl-0 = <&scif1_pins>;
> +&scifa1 {
> +	pinctrl-0 = <&scifa1_pins>;
>  	pinctrl-names = "default";
> 
>  	status = "okay";
Simon Horman Sept. 17, 2014, 11:55 p.m. UTC | #2
On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
> Hi Wolfram,
> 
> On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> > From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > 
> > SCIF and SCIFA can be plexed onto the same wires on Lager board. The
> > datasheet also describes the wires as SCIFA. So, to make use of the
> > bigger FIFOs switch to SCIFA instead.
> > 
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > ---
> > 
> > Currently, I use this patch to check if the DMA RX issue is the same on SCIF
> > and SCIFA (yes, it is). However, I still think it makes sense to use the
> > bigger FIFOs. I will check this next week with Bastian's FIFO patches.
> > Until then, I send this as RFC to collect opinions speaking for/against
> > this change.
> 
> I have nothing against this change, but I believe the aliases should now be 
> serial0 and serial1 to match the legacy code (OK, that's a lame excuse, we all 
> know that I just want to change the aliases ;-)).

Thanks Laurent, I think its probably time we had that conversation again.
But I think that change can be done (or not ^) separately to this change.

As it is, I think this patch is just a little too late for v3.18.
I'll see about queuing it up for v3.19 in the not to distant future.

> >  arch/arm/boot/dts/r8a7790-lager.dts | 24 ++++++++++++------------
> >  1 file changed, 12 insertions(+), 12 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> > b/arch/arm/boot/dts/r8a7790-lager.dts index 84dcafa7179b..782f0aa938b3
> > 100644
> > --- a/arch/arm/boot/dts/r8a7790-lager.dts
> > +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> > @@ -19,8 +19,8 @@
> >  	compatible = "renesas,lager", "renesas,r8a7790";
> > 
> >  	aliases {
> > -		serial6 = &scif0;
> > -		serial7 = &scif1;
> > +		serial6 = &scifa0;
> > +		serial7 = &scifa1;
> >  	};
> > 
> >  	chosen {
> > @@ -159,9 +159,9 @@
> >  		renesas,function = "du";
> >  	};
> > 
> > -	scif0_pins: serial0 {
> > -		renesas,groups = "scif0_data";
> > -		renesas,function = "scif0";
> > +	scifa0_pins: serial0 {
> > +		renesas,groups = "scifa0_data";
> > +		renesas,function = "scifa0";
> >  	};
> > 
> >  	ether_pins: ether {
> > @@ -174,9 +174,9 @@
> >  		renesas,function = "intc";
> >  	};
> > 
> > -	scif1_pins: serial1 {
> > -		renesas,groups = "scif1_data";
> > -		renesas,function = "scif1";
> > +	scifa1_pins: serial1 {
> > +		renesas,groups = "scifa1_data";
> > +		renesas,function = "scifa1";
> >  	};
> > 
> >  	sdhi0_pins: sd0 {
> > @@ -308,15 +308,15 @@
> >  	};
> >  };
> > 
> > -&scif0 {
> > -	pinctrl-0 = <&scif0_pins>;
> > +&scifa0 {
> > +	pinctrl-0 = <&scifa0_pins>;
> >  	pinctrl-names = "default";
> > 
> >  	status = "okay";
> >  };
> > 
> > -&scif1 {
> > -	pinctrl-0 = <&scif1_pins>;
> > +&scifa1 {
> > +	pinctrl-0 = <&scifa1_pins>;
> >  	pinctrl-names = "default";
> > 
> >  	status = "okay";
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart Sept. 18, 2014, 7:57 a.m. UTC | #3
Hi Simon,

On Thursday 18 September 2014 08:55:43 Simon Horman wrote:
> On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
> > Hi Wolfram,
> > 
> > On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> > > From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > 
> > > SCIF and SCIFA can be plexed onto the same wires on Lager board. The
> > > datasheet also describes the wires as SCIFA. So, to make use of the
> > > bigger FIFOs switch to SCIFA instead.
> > > 
> > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > ---
> > > 
> > > Currently, I use this patch to check if the DMA RX issue is the same on
> > > SCIF and SCIFA (yes, it is). However, I still think it makes sense to
> > > use the bigger FIFOs. I will check this next week with Bastian's FIFO
> > > patches. Until then, I send this as RFC to collect opinions speaking
> > > for/against this change.
> > 
> > I have nothing against this change, but I believe the aliases should now
> > be serial0 and serial1 to match the legacy code (OK, that's a lame excuse,
> > we all know that I just want to change the aliases ;-)).
> 
> Thanks Laurent, I think its probably time we had that conversation again.
> But I think that change can be done (or not ^) separately to this change.

It could, but I believe it would make sense to do both in one patch, otherwise 
there will be a console serial port device mismatch between the legacy and 
multiplatform cases.

> As it is, I think this patch is just a little too late for v3.18.
> I'll see about queuing it up for v3.19 in the not to distant future.
> 
> > >  arch/arm/boot/dts/r8a7790-lager.dts | 24 ++++++++++++------------
> > >  1 file changed, 12 insertions(+), 12 deletions(-)
> > > 
> > > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> > > b/arch/arm/boot/dts/r8a7790-lager.dts index 84dcafa7179b..782f0aa938b3
> > > 100644
> > > --- a/arch/arm/boot/dts/r8a7790-lager.dts
> > > +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> > > @@ -19,8 +19,8 @@
> > >  	compatible = "renesas,lager", "renesas,r8a7790";
> > >  	
> > >  	aliases {
> > > -		serial6 = &scif0;
> > > -		serial7 = &scif1;
> > > +		serial6 = &scifa0;
> > > +		serial7 = &scifa1;
> > >  	};
> > >  	
> > >  	chosen {
> > > @@ -159,9 +159,9 @@
> > >  		renesas,function = "du";
> > >  	};
> > > 
> > > -	scif0_pins: serial0 {
> > > -		renesas,groups = "scif0_data";
> > > -		renesas,function = "scif0";
> > > +	scifa0_pins: serial0 {
> > > +		renesas,groups = "scifa0_data";
> > > +		renesas,function = "scifa0";
> > >  	};
> > >  	
> > >  	ether_pins: ether {
> > > @@ -174,9 +174,9 @@
> > >  		renesas,function = "intc";
> > >  	};
> > > 
> > > -	scif1_pins: serial1 {
> > > -		renesas,groups = "scif1_data";
> > > -		renesas,function = "scif1";
> > > +	scifa1_pins: serial1 {
> > > +		renesas,groups = "scifa1_data";
> > > +		renesas,function = "scifa1";
> > >  	};
> > >  	
> > >  	sdhi0_pins: sd0 {
> > > @@ -308,15 +308,15 @@
> > >  	};
> > >  };
> > > 
> > > -&scif0 {
> > > -	pinctrl-0 = <&scif0_pins>;
> > > +&scifa0 {
> > > +	pinctrl-0 = <&scifa0_pins>;
> > >  	pinctrl-names = "default";
> > >  	
> > >  	status = "okay";
> > >  };
> > > 
> > > -&scif1 {
> > > -	pinctrl-0 = <&scif1_pins>;
> > > +&scifa1 {
> > > +	pinctrl-0 = <&scifa1_pins>;
> > >  	pinctrl-names = "default";
> > >  	
> > >  	status = "okay";
Simon Horman Sept. 19, 2014, 3:28 a.m. UTC | #4
On Thu, Sep 18, 2014 at 10:57:12AM +0300, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Thursday 18 September 2014 08:55:43 Simon Horman wrote:
> > On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
> > > Hi Wolfram,
> > > 
> > > On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> > > > From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > > 
> > > > SCIF and SCIFA can be plexed onto the same wires on Lager board. The
> > > > datasheet also describes the wires as SCIFA. So, to make use of the
> > > > bigger FIFOs switch to SCIFA instead.
> > > > 
> > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > > ---
> > > > 
> > > > Currently, I use this patch to check if the DMA RX issue is the same on
> > > > SCIF and SCIFA (yes, it is). However, I still think it makes sense to
> > > > use the bigger FIFOs. I will check this next week with Bastian's FIFO
> > > > patches. Until then, I send this as RFC to collect opinions speaking
> > > > for/against this change.
> > > 
> > > I have nothing against this change, but I believe the aliases should now
> > > be serial0 and serial1 to match the legacy code (OK, that's a lame excuse,
> > > we all know that I just want to change the aliases ;-)).
> > 
> > Thanks Laurent, I think its probably time we had that conversation again.
> > But I think that change can be done (or not ^) separately to this change.
> 
> It could, but I believe it would make sense to do both in one patch, otherwise 
> there will be a console serial port device mismatch between the legacy and 
> multiplatform cases.

I'm a little confused.
Does this patch introduce such a miss-match?

> 
> > As it is, I think this patch is just a little too late for v3.18.
> > I'll see about queuing it up for v3.19 in the not to distant future.
> > 
> > > >  arch/arm/boot/dts/r8a7790-lager.dts | 24 ++++++++++++------------
> > > >  1 file changed, 12 insertions(+), 12 deletions(-)
> > > > 
> > > > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> > > > b/arch/arm/boot/dts/r8a7790-lager.dts index 84dcafa7179b..782f0aa938b3
> > > > 100644
> > > > --- a/arch/arm/boot/dts/r8a7790-lager.dts
> > > > +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> > > > @@ -19,8 +19,8 @@
> > > >  	compatible = "renesas,lager", "renesas,r8a7790";
> > > >  	
> > > >  	aliases {
> > > > -		serial6 = &scif0;
> > > > -		serial7 = &scif1;
> > > > +		serial6 = &scifa0;
> > > > +		serial7 = &scifa1;
> > > >  	};
> > > >  	
> > > >  	chosen {
> > > > @@ -159,9 +159,9 @@
> > > >  		renesas,function = "du";
> > > >  	};
> > > > 
> > > > -	scif0_pins: serial0 {
> > > > -		renesas,groups = "scif0_data";
> > > > -		renesas,function = "scif0";
> > > > +	scifa0_pins: serial0 {
> > > > +		renesas,groups = "scifa0_data";
> > > > +		renesas,function = "scifa0";
> > > >  	};
> > > >  	
> > > >  	ether_pins: ether {
> > > > @@ -174,9 +174,9 @@
> > > >  		renesas,function = "intc";
> > > >  	};
> > > > 
> > > > -	scif1_pins: serial1 {
> > > > -		renesas,groups = "scif1_data";
> > > > -		renesas,function = "scif1";
> > > > +	scifa1_pins: serial1 {
> > > > +		renesas,groups = "scifa1_data";
> > > > +		renesas,function = "scifa1";
> > > >  	};
> > > >  	
> > > >  	sdhi0_pins: sd0 {
> > > > @@ -308,15 +308,15 @@
> > > >  	};
> > > >  };
> > > > 
> > > > -&scif0 {
> > > > -	pinctrl-0 = <&scif0_pins>;
> > > > +&scifa0 {
> > > > +	pinctrl-0 = <&scifa0_pins>;
> > > >  	pinctrl-names = "default";
> > > >  	
> > > >  	status = "okay";
> > > >  };
> > > > 
> > > > -&scif1 {
> > > > -	pinctrl-0 = <&scif1_pins>;
> > > > +&scifa1 {
> > > > +	pinctrl-0 = <&scifa1_pins>;
> > > >  	pinctrl-names = "default";
> > > >  	
> > > >  	status = "okay";
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Sept. 30, 2014, 4:30 a.m. UTC | #5
On Fri, Sep 19, 2014 at 12:28:28PM +0900, Simon Horman wrote:
> On Thu, Sep 18, 2014 at 10:57:12AM +0300, Laurent Pinchart wrote:
> > Hi Simon,
> > 
> > On Thursday 18 September 2014 08:55:43 Simon Horman wrote:
> > > On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
> > > > Hi Wolfram,
> > > > 
> > > > On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> > > > > From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > > > 
> > > > > SCIF and SCIFA can be plexed onto the same wires on Lager board. The
> > > > > datasheet also describes the wires as SCIFA. So, to make use of the
> > > > > bigger FIFOs switch to SCIFA instead.
> > > > > 
> > > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > > > ---
> > > > > 
> > > > > Currently, I use this patch to check if the DMA RX issue is the same on
> > > > > SCIF and SCIFA (yes, it is). However, I still think it makes sense to
> > > > > use the bigger FIFOs. I will check this next week with Bastian's FIFO
> > > > > patches. Until then, I send this as RFC to collect opinions speaking
> > > > > for/against this change.
> > > > 
> > > > I have nothing against this change, but I believe the aliases should now
> > > > be serial0 and serial1 to match the legacy code (OK, that's a lame excuse,
> > > > we all know that I just want to change the aliases ;-)).
> > > 
> > > Thanks Laurent, I think its probably time we had that conversation again.
> > > But I think that change can be done (or not ^) separately to this change.
> > 
> > It could, but I believe it would make sense to do both in one patch, otherwise 
> > there will be a console serial port device mismatch between the legacy and 
> > multiplatform cases.
> 
> I'm a little confused.
> Does this patch introduce such a miss-match?

Hi Laurent,

I'd like to move this forwards somehow.

> > > As it is, I think this patch is just a little too late for v3.18.
> > > I'll see about queuing it up for v3.19 in the not to distant future.
> > > 
> > > > >  arch/arm/boot/dts/r8a7790-lager.dts | 24 ++++++++++++------------
> > > > >  1 file changed, 12 insertions(+), 12 deletions(-)
> > > > > 
> > > > > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> > > > > b/arch/arm/boot/dts/r8a7790-lager.dts index 84dcafa7179b..782f0aa938b3
> > > > > 100644
> > > > > --- a/arch/arm/boot/dts/r8a7790-lager.dts
> > > > > +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> > > > > @@ -19,8 +19,8 @@
> > > > >  	compatible = "renesas,lager", "renesas,r8a7790";
> > > > >  	
> > > > >  	aliases {
> > > > > -		serial6 = &scif0;
> > > > > -		serial7 = &scif1;
> > > > > +		serial6 = &scifa0;
> > > > > +		serial7 = &scifa1;
> > > > >  	};
> > > > >  	
> > > > >  	chosen {
> > > > > @@ -159,9 +159,9 @@
> > > > >  		renesas,function = "du";
> > > > >  	};
> > > > > 
> > > > > -	scif0_pins: serial0 {
> > > > > -		renesas,groups = "scif0_data";
> > > > > -		renesas,function = "scif0";
> > > > > +	scifa0_pins: serial0 {
> > > > > +		renesas,groups = "scifa0_data";
> > > > > +		renesas,function = "scifa0";
> > > > >  	};
> > > > >  	
> > > > >  	ether_pins: ether {
> > > > > @@ -174,9 +174,9 @@
> > > > >  		renesas,function = "intc";
> > > > >  	};
> > > > > 
> > > > > -	scif1_pins: serial1 {
> > > > > -		renesas,groups = "scif1_data";
> > > > > -		renesas,function = "scif1";
> > > > > +	scifa1_pins: serial1 {
> > > > > +		renesas,groups = "scifa1_data";
> > > > > +		renesas,function = "scifa1";
> > > > >  	};
> > > > >  	
> > > > >  	sdhi0_pins: sd0 {
> > > > > @@ -308,15 +308,15 @@
> > > > >  	};
> > > > >  };
> > > > > 
> > > > > -&scif0 {
> > > > > -	pinctrl-0 = <&scif0_pins>;
> > > > > +&scifa0 {
> > > > > +	pinctrl-0 = <&scifa0_pins>;
> > > > >  	pinctrl-names = "default";
> > > > >  	
> > > > >  	status = "okay";
> > > > >  };
> > > > > 
> > > > > -&scif1 {
> > > > > -	pinctrl-0 = <&scif1_pins>;
> > > > > +&scifa1 {
> > > > > +	pinctrl-0 = <&scifa1_pins>;
> > > > >  	pinctrl-names = "default";
> > > > >  	
> > > > >  	status = "okay";
> > 
> > -- 
> > Regards,
> > 
> > Laurent Pinchart
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart Sept. 30, 2014, 10:40 a.m. UTC | #6
Hi Simon,

On Tuesday 30 September 2014 13:30:29 Simon Horman wrote:
> On Fri, Sep 19, 2014 at 12:28:28PM +0900, Simon Horman wrote:
> > On Thu, Sep 18, 2014 at 10:57:12AM +0300, Laurent Pinchart wrote:
> >> On Thursday 18 September 2014 08:55:43 Simon Horman wrote:
> >>> On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
> >>>> On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> >>>>> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> >>>>> 
> >>>>> SCIF and SCIFA can be plexed onto the same wires on Lager board.
> >>>>> The datasheet also describes the wires as SCIFA. So, to make use
> >>>>> of the bigger FIFOs switch to SCIFA instead.
> >>>>> 
> >>>>> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> >>>>> ---
> >>>>> 
> >>>>> Currently, I use this patch to check if the DMA RX issue is the
> >>>>> same on SCIF and SCIFA (yes, it is). However, I still think it
> >>>>> makes sense to use the bigger FIFOs. I will check this next week
> >>>>> with Bastian's FIFO patches. Until then, I send this as RFC to
> >>>>> collect opinions speaking for/against this change.
> >>>> 
> >>>> I have nothing against this change, but I believe the aliases should
> >>>> now be serial0 and serial1 to match the legacy code (OK, that's a
> >>>> lame excuse, we all know that I just want to change the aliases
> >>>> ;-)).
> >>> 
> >>> Thanks Laurent, I think its probably time we had that conversation
> >>> again. But I think that change can be done (or not ^) separately to
> >>> this change.
> >> 
> >> It could, but I believe it would make sense to do both in one patch,
> >> otherwise there will be a console serial port device mismatch between
> >> the legacy and multiplatform cases.
> > 
> > I'm a little confused.
> > Does this patch introduce such a miss-match?
> 
> Hi Laurent,
> 
> I'd like to move this forwards somehow.

This patch switches the Lager board to use SCIFA[01] instead of SCIF[01], 
while keeping the Linux devices named /dev/ttySC[67]. With legacy boot, 
SCIFA[01] are named /dev/ttySC[01]. There would thus be a mismatch in that 
sense, even if this change doesn't prevent using the same Linux serial devices 
on both legacy and DT boot.

I'll let you decide whether this is a problem that should be fixed.

> >>> As it is, I think this patch is just a little too late for v3.18.
> >>> I'll see about queuing it up for v3.19 in the not to distant future.
> >>> 
> >>>>>  arch/arm/boot/dts/r8a7790-lager.dts | 24 ++++++++++++------------
> >>>>>  1 file changed, 12 insertions(+), 12 deletions(-)
> >>>>> 
> >>>>> diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> >>>>> b/arch/arm/boot/dts/r8a7790-lager.dts index
> >>>>> 84dcafa7179b..782f0aa938b3
> >>>>> 100644
> >>>>> --- a/arch/arm/boot/dts/r8a7790-lager.dts
> >>>>> +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> >>>>> @@ -19,8 +19,8 @@
> >>>>>  	compatible = "renesas,lager", "renesas,r8a7790";
> >>>>>  	
> >>>>>  	aliases {
> >>>>> -		serial6 = &scif0;
> >>>>> -		serial7 = &scif1;
> >>>>> +		serial6 = &scifa0;
> >>>>> +		serial7 = &scifa1;
> >>>>>  	};
> >>>>>  	
> >>>>>  	chosen {
> >>>>> @@ -159,9 +159,9 @@
> >>>>>  		renesas,function = "du";
> >>>>>  	};
> >>>>> 
> >>>>> -	scif0_pins: serial0 {
> >>>>> -		renesas,groups = "scif0_data";
> >>>>> -		renesas,function = "scif0";
> >>>>> +	scifa0_pins: serial0 {
> >>>>> +		renesas,groups = "scifa0_data";
> >>>>> +		renesas,function = "scifa0";
> >>>>>  	};
> >>>>>  	
> >>>>>  	ether_pins: ether {
> >>>>> @@ -174,9 +174,9 @@
> >>>>>  		renesas,function = "intc";
> >>>>>  	};
> >>>>> 
> >>>>> -	scif1_pins: serial1 {
> >>>>> -		renesas,groups = "scif1_data";
> >>>>> -		renesas,function = "scif1";
> >>>>> +	scifa1_pins: serial1 {
> >>>>> +		renesas,groups = "scifa1_data";
> >>>>> +		renesas,function = "scifa1";
> >>>>>  	};
> >>>>>  	
> >>>>>  	sdhi0_pins: sd0 {
> >>>>> @@ -308,15 +308,15 @@
> >>>>>  	};
> >>>>>  };
> >>>>> 
> >>>>> -&scif0 {
> >>>>> -	pinctrl-0 = <&scif0_pins>;
> >>>>> +&scifa0 {
> >>>>> +	pinctrl-0 = <&scifa0_pins>;
> >>>>>  	pinctrl-names = "default";
> >>>>>  	status = "okay";
> >>>>>  };
> >>>>> 
> >>>>> -&scif1 {
> >>>>> -	pinctrl-0 = <&scif1_pins>;
> >>>>> +&scifa1 {
> >>>>> +	pinctrl-0 = <&scifa1_pins>;
> >>>>>  	pinctrl-names = "default";
> >>>>>  	
> >>>>>  	status = "okay";
Geert Uytterhoeven Sept. 30, 2014, 10:44 a.m. UTC | #7
Hi Laurent,

On Tue, Sep 30, 2014 at 12:40 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Tuesday 30 September 2014 13:30:29 Simon Horman wrote:
>> On Fri, Sep 19, 2014 at 12:28:28PM +0900, Simon Horman wrote:
>> > On Thu, Sep 18, 2014 at 10:57:12AM +0300, Laurent Pinchart wrote:
>> >> On Thursday 18 September 2014 08:55:43 Simon Horman wrote:
>> >>> On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
>> >>>> On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
>> >>>>> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
>> >>>>>
>> >>>>> SCIF and SCIFA can be plexed onto the same wires on Lager board.
>> >>>>> The datasheet also describes the wires as SCIFA. So, to make use
>> >>>>> of the bigger FIFOs switch to SCIFA instead.
>> >>>>>
>> >>>>> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
>> >>>>> ---
>> >>>>>
>> >>>>> Currently, I use this patch to check if the DMA RX issue is the
>> >>>>> same on SCIF and SCIFA (yes, it is). However, I still think it
>> >>>>> makes sense to use the bigger FIFOs. I will check this next week
>> >>>>> with Bastian's FIFO patches. Until then, I send this as RFC to
>> >>>>> collect opinions speaking for/against this change.
>> >>>>
>> >>>> I have nothing against this change, but I believe the aliases should
>> >>>> now be serial0 and serial1 to match the legacy code (OK, that's a
>> >>>> lame excuse, we all know that I just want to change the aliases
>> >>>> ;-)).
>> >>>
>> >>> Thanks Laurent, I think its probably time we had that conversation
>> >>> again. But I think that change can be done (or not ^) separately to
>> >>> this change.
>> >>
>> >> It could, but I believe it would make sense to do both in one patch,
>> >> otherwise there will be a console serial port device mismatch between
>> >> the legacy and multiplatform cases.
>> >
>> > I'm a little confused.
>> > Does this patch introduce such a miss-match?
>>
>> Hi Laurent,
>>
>> I'd like to move this forwards somehow.
>
> This patch switches the Lager board to use SCIFA[01] instead of SCIF[01],
> while keeping the Linux devices named /dev/ttySC[67]. With legacy boot,
> SCIFA[01] are named /dev/ttySC[01]. There would thus be a mismatch in that
> sense, even if this change doesn't prevent using the same Linux serial devices
> on both legacy and DT boot.

So if I understand if correctly, booting with the current
"console=ttySC6,115200"
in /chosen/bootargs will give a working console for both legacy and
multi-platform,
but the underlying serial hardware block for the console differs (legacy uses
SCIF0, multi-platform uses SCIFA0)?

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
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart Sept. 30, 2014, 10:48 a.m. UTC | #8
Hi Geert,

On Tuesday 30 September 2014 12:44:59 Geert Uytterhoeven wrote:
> On Tue, Sep 30, 2014 at 12:40 PM, Laurent Pinchart wrote:
> > On Tuesday 30 September 2014 13:30:29 Simon Horman wrote:
> >> On Fri, Sep 19, 2014 at 12:28:28PM +0900, Simon Horman wrote:
> >>> On Thu, Sep 18, 2014 at 10:57:12AM +0300, Laurent Pinchart wrote:
> >>>> On Thursday 18 September 2014 08:55:43 Simon Horman wrote:
> >>>>> On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
> >>>>>> On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> >>>>>>> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> >>>>>>> 
> >>>>>>> SCIF and SCIFA can be plexed onto the same wires on Lager board.
> >>>>>>> The datasheet also describes the wires as SCIFA. So, to make use
> >>>>>>> of the bigger FIFOs switch to SCIFA instead.
> >>>>>>> 
> >>>>>>> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> >>>>>>> ---
> >>>>>>> 
> >>>>>>> Currently, I use this patch to check if the DMA RX issue is the
> >> >>>>> same on SCIF and SCIFA (yes, it is). However, I still think it
> >>>>>>> makes sense to use the bigger FIFOs. I will check this next week
> >>>>>>> with Bastian's FIFO patches. Until then, I send this as RFC to
> >>>>>>> collect opinions speaking for/against this change.
> >>>>>> 
> >>>>>> I have nothing against this change, but I believe the aliases should
> >>>>>> now be serial0 and serial1 to match the legacy code (OK, that's a
> >>>>>> lame excuse, we all know that I just want to change the aliases
> >>>>>> ;-)).
> >>>>> 
> >>>>> Thanks Laurent, I think its probably time we had that conversation
> >>>>> again. But I think that change can be done (or not ^) separately to
> >>>>> this change.
> >>>> 
> >>>> It could, but I believe it would make sense to do both in one patch,
> >>>> otherwise there will be a console serial port device mismatch between
> >>>> the legacy and multiplatform cases.
> >>> 
> >>> I'm a little confused.
> >> > Does this patch introduce such a miss-match?
> >> 
> >> Hi Laurent,
> >> 
> >> I'd like to move this forwards somehow.
> > 
> > This patch switches the Lager board to use SCIFA[01] instead of SCIF[01],
> > while keeping the Linux devices named /dev/ttySC[67]. With legacy boot,
> > SCIFA[01] are named /dev/ttySC[01]. There would thus be a mismatch in that
> > sense, even if this change doesn't prevent using the same Linux serial
> > devices on both legacy and DT boot.
> 
> So if I understand if correctly, booting with the current
> "console=ttySC6,115200"
> in /chosen/bootargs will give a working console for both legacy and
> multi-platform,
> but the underlying serial hardware block for the console differs (legacy
> uses SCIF0, multi-platform uses SCIFA0)?

As far as I understand that's correct.
Simon Horman Sept. 30, 2014, 11:58 p.m. UTC | #9
On Tue, Sep 30, 2014 at 01:48:27PM +0300, Laurent Pinchart wrote:
> Hi Geert,
> 
> On Tuesday 30 September 2014 12:44:59 Geert Uytterhoeven wrote:
> > On Tue, Sep 30, 2014 at 12:40 PM, Laurent Pinchart wrote:
> > > On Tuesday 30 September 2014 13:30:29 Simon Horman wrote:
> > >> On Fri, Sep 19, 2014 at 12:28:28PM +0900, Simon Horman wrote:
> > >>> On Thu, Sep 18, 2014 at 10:57:12AM +0300, Laurent Pinchart wrote:
> > >>>> On Thursday 18 September 2014 08:55:43 Simon Horman wrote:
> > >>>>> On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
> > >>>>>> On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> > >>>>>>> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > >>>>>>> 
> > >>>>>>> SCIF and SCIFA can be plexed onto the same wires on Lager board.
> > >>>>>>> The datasheet also describes the wires as SCIFA. So, to make use
> > >>>>>>> of the bigger FIFOs switch to SCIFA instead.
> > >>>>>>> 
> > >>>>>>> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > >>>>>>> ---
> > >>>>>>> 
> > >>>>>>> Currently, I use this patch to check if the DMA RX issue is the
> > >> >>>>> same on SCIF and SCIFA (yes, it is). However, I still think it
> > >>>>>>> makes sense to use the bigger FIFOs. I will check this next week
> > >>>>>>> with Bastian's FIFO patches. Until then, I send this as RFC to
> > >>>>>>> collect opinions speaking for/against this change.
> > >>>>>> 
> > >>>>>> I have nothing against this change, but I believe the aliases should
> > >>>>>> now be serial0 and serial1 to match the legacy code (OK, that's a
> > >>>>>> lame excuse, we all know that I just want to change the aliases
> > >>>>>> ;-)).
> > >>>>> 
> > >>>>> Thanks Laurent, I think its probably time we had that conversation
> > >>>>> again. But I think that change can be done (or not ^) separately to
> > >>>>> this change.
> > >>>> 
> > >>>> It could, but I believe it would make sense to do both in one patch,
> > >>>> otherwise there will be a console serial port device mismatch between
> > >>>> the legacy and multiplatform cases.
> > >>> 
> > >>> I'm a little confused.
> > >> > Does this patch introduce such a miss-match?
> > >> 
> > >> Hi Laurent,
> > >> 
> > >> I'd like to move this forwards somehow.
> > > 
> > > This patch switches the Lager board to use SCIFA[01] instead of SCIF[01],
> > > while keeping the Linux devices named /dev/ttySC[67]. With legacy boot,
> > > SCIFA[01] are named /dev/ttySC[01]. There would thus be a mismatch in that
> > > sense, even if this change doesn't prevent using the same Linux serial
> > > devices on both legacy and DT boot.
> > 
> > So if I understand if correctly, booting with the current
> > "console=ttySC6,115200"
> > in /chosen/bootargs will give a working console for both legacy and
> > multi-platform,
> > but the underlying serial hardware block for the console differs (legacy
> > uses SCIF0, multi-platform uses SCIFA0)?
> 
> As far as I understand that's correct.

I think that is a reasonable state of affairs so long as we have
Legacy C for Lager, which it seems we will have for a little while to come.

I will confer with Magnus as he has had strong opinions in this area
in the past.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Oct. 2, 2014, 12:12 a.m. UTC | #10
On Wed, Oct 01, 2014 at 08:58:35AM +0900, Simon Horman wrote:
> On Tue, Sep 30, 2014 at 01:48:27PM +0300, Laurent Pinchart wrote:
> > Hi Geert,
> > 
> > On Tuesday 30 September 2014 12:44:59 Geert Uytterhoeven wrote:
> > > On Tue, Sep 30, 2014 at 12:40 PM, Laurent Pinchart wrote:
> > > > On Tuesday 30 September 2014 13:30:29 Simon Horman wrote:
> > > >> On Fri, Sep 19, 2014 at 12:28:28PM +0900, Simon Horman wrote:
> > > >>> On Thu, Sep 18, 2014 at 10:57:12AM +0300, Laurent Pinchart wrote:
> > > >>>> On Thursday 18 September 2014 08:55:43 Simon Horman wrote:
> > > >>>>> On Wed, Sep 17, 2014 at 05:40:07PM +0300, Laurent Pinchart wrote:
> > > >>>>>> On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
> > > >>>>>>> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > >>>>>>> 
> > > >>>>>>> SCIF and SCIFA can be plexed onto the same wires on Lager board.
> > > >>>>>>> The datasheet also describes the wires as SCIFA. So, to make use
> > > >>>>>>> of the bigger FIFOs switch to SCIFA instead.
> > > >>>>>>> 
> > > >>>>>>> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > >>>>>>> ---
> > > >>>>>>> 
> > > >>>>>>> Currently, I use this patch to check if the DMA RX issue is the
> > > >> >>>>> same on SCIF and SCIFA (yes, it is). However, I still think it
> > > >>>>>>> makes sense to use the bigger FIFOs. I will check this next week
> > > >>>>>>> with Bastian's FIFO patches. Until then, I send this as RFC to
> > > >>>>>>> collect opinions speaking for/against this change.
> > > >>>>>> 
> > > >>>>>> I have nothing against this change, but I believe the aliases should
> > > >>>>>> now be serial0 and serial1 to match the legacy code (OK, that's a
> > > >>>>>> lame excuse, we all know that I just want to change the aliases
> > > >>>>>> ;-)).
> > > >>>>> 
> > > >>>>> Thanks Laurent, I think its probably time we had that conversation
> > > >>>>> again. But I think that change can be done (or not ^) separately to
> > > >>>>> this change.
> > > >>>> 
> > > >>>> It could, but I believe it would make sense to do both in one patch,
> > > >>>> otherwise there will be a console serial port device mismatch between
> > > >>>> the legacy and multiplatform cases.
> > > >>> 
> > > >>> I'm a little confused.
> > > >> > Does this patch introduce such a miss-match?
> > > >> 
> > > >> Hi Laurent,
> > > >> 
> > > >> I'd like to move this forwards somehow.
> > > > 
> > > > This patch switches the Lager board to use SCIFA[01] instead of SCIF[01],
> > > > while keeping the Linux devices named /dev/ttySC[67]. With legacy boot,
> > > > SCIFA[01] are named /dev/ttySC[01]. There would thus be a mismatch in that
> > > > sense, even if this change doesn't prevent using the same Linux serial
> > > > devices on both legacy and DT boot.
> > > 
> > > So if I understand if correctly, booting with the current
> > > "console=ttySC6,115200"
> > > in /chosen/bootargs will give a working console for both legacy and
> > > multi-platform,
> > > but the underlying serial hardware block for the console differs (legacy
> > > uses SCIF0, multi-platform uses SCIFA0)?
> > 
> > As far as I understand that's correct.
> 
> I think that is a reasonable state of affairs so long as we have
> Legacy C for Lager, which it seems we will have for a little while to come.
> 
> I will confer with Magnus as he has had strong opinions in this area
> in the past.

Magnus also seems happy with this change so I have queued it up.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Khiem Nguyen Oct. 2, 2014, 11:14 p.m. UTC | #11
Hi Wolfram, Simon,

Though the patch was already queued up by Simon,
I'd like to confirm one point in changelog.

On 10/2/2014 9:12 AM, Simon Horman wrote:
[snip]
>>>>>>>>>> On Tuesday 16 September 2014 18:10:37 Wolfram Sang wrote:
>>>>>>>>>>> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
>>>>>>>>>>>
>>>>>>>>>>> SCIF and SCIFA can be plexed onto the same wires on Lager board.
>>>>>>>>>>> The datasheet also describes the wires as SCIFA. So, to make use
>>>>>>>>>>> of the bigger FIFOs switch to SCIFA instead.

Which datasheet you are mentioned about ?
I checked Lager board datasheet rev0.09 and it said debug interface is SCIF0 and SCIF1.

[snip]
>>>>>>>>>>> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
[snip]
>>>>>>>>>>> Currently, I use this patch to check if the DMA RX issue is the
>>>>>>>>>>> same on SCIF and SCIFA (yes, it is). However, I still think it
>>>>>>>>>>> makes sense to use the bigger FIFOs. I will check this next week
>>>>>>>>>>> with Bastian's FIFO patches. Until then, I send this as RFC to
>>>>>>>>>>> collect opinions speaking for/against this change.

[snip]
>>>>>>>>>> I have nothing against this change, but I believe the aliases should
>>>>>>>>>> now be serial0 and serial1 to match the legacy code (OK, that's a
>>>>>>>>>> lame excuse, we all know that I just want to change the aliases
>>>>>>>>>> ;-)).

[snip]
>>>>> This patch switches the Lager board to use SCIFA[01] instead of SCIF[01],
>>>>> while keeping the Linux devices named /dev/ttySC[67]. With legacy boot,
>>>>> SCIFA[01] are named /dev/ttySC[01]. There would thus be a mismatch in that
>>>>> sense, even if this change doesn't prevent using the same Linux serial
>>>>> devices on both legacy and DT boot.

[snip]
>>>> So if I understand if correctly, booting with the current
>>>> "console=ttySC6,115200"
>>>> in /chosen/bootargs will give a working console for both legacy and
>>>> multi-platform,
>>>> but the underlying serial hardware block for the console differs (legacy
>>>> uses SCIF0, multi-platform uses SCIFA0)?

[snip]
>> I will confer with Magnus as he has had strong opinions in this area
>> in the past.

[snip] 
> Magnus also seems happy with this change so I have queued it up.
Wolfram Sang Oct. 3, 2014, 12:13 a.m. UTC | #12
Hello,

> Which datasheet you are mentioned about ?
> I checked Lager board datasheet rev0.09 and it said debug interface is SCIF0 and SCIF1.

V0.12D. On Page 22, the headline says "Debug Interface (SCIF0)", true.
However, the wires are named SCIFA0_TXD/RXD. Same for SCIF(A)1. On Page
2, as well. Check Y30 and AA29, they are named SCIFA0/A1.

Kind regards,

   Wolfram
Khiem Nguyen Oct. 3, 2014, 3:25 a.m. UTC | #13
Hi Wolfram,

On 10/3/2014 9:13 AM, Wolfram Sang wrote:
> Hello,
> 
>> Which datasheet you are mentioned about ?
>> I checked Lager board datasheet rev0.09 and it said debug interface is SCIF0 and SCIF1.
> 
> V0.12D. On Page 22, the headline says "Debug Interface (SCIF0)", true.
> However, the wires are named SCIFA0_TXD/RXD. Same for SCIF(A)1. On Page
> 2, as well. Check Y30 and AA29, they are named SCIFA0/A1.

I think you got the information from circuit diagram of Lager board.
However, I got my information from Hardware manual of Lager board.

I also checked circuit diagram and see the mismatch
between circuit diagram and hardware manual.

I'm confirming with related persons.
Will let you know the update soon.

> Kind regards,
> 
>    Wolfram
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 84dcafa7179b..782f0aa938b3 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -19,8 +19,8 @@ 
 	compatible = "renesas,lager", "renesas,r8a7790";
 
 	aliases {
-		serial6 = &scif0;
-		serial7 = &scif1;
+		serial6 = &scifa0;
+		serial7 = &scifa1;
 	};
 
 	chosen {
@@ -159,9 +159,9 @@ 
 		renesas,function = "du";
 	};
 
-	scif0_pins: serial0 {
-		renesas,groups = "scif0_data";
-		renesas,function = "scif0";
+	scifa0_pins: serial0 {
+		renesas,groups = "scifa0_data";
+		renesas,function = "scifa0";
 	};
 
 	ether_pins: ether {
@@ -174,9 +174,9 @@ 
 		renesas,function = "intc";
 	};
 
-	scif1_pins: serial1 {
-		renesas,groups = "scif1_data";
-		renesas,function = "scif1";
+	scifa1_pins: serial1 {
+		renesas,groups = "scifa1_data";
+		renesas,function = "scifa1";
 	};
 
 	sdhi0_pins: sd0 {
@@ -308,15 +308,15 @@ 
 	};
 };
 
-&scif0 {
-	pinctrl-0 = <&scif0_pins>;
+&scifa0 {
+	pinctrl-0 = <&scifa0_pins>;
 	pinctrl-names = "default";
 
 	status = "okay";
 };
 
-&scif1 {
-	pinctrl-0 = <&scif1_pins>;
+&scifa1 {
+	pinctrl-0 = <&scifa1_pins>;
 	pinctrl-names = "default";
 
 	status = "okay";