[PATCH] sh: fix the id of scif in SH7757

[PATCH] sh: fix the id of scif in SH7757

[Yoshihiro Shimoda]

Because the value of CONFIG_SERIAL_SH_SCI_NR_UARTS is 3.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/sh/kernel/cpu/sh4a/setup-sh7757.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index 444aca9..93b7aa4 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -26,7 +26,7 @@ static struct plat_sci_port scif2_platform_data = {

 static struct platform_device scif2_device = {
 	.name		= "sh-sci",
-	.id		= 2,
+	.id		= 0,
 	.dev		= {
 		.platform_data	= &scif2_platform_data,
 	},
@@ -41,7 +41,7 @@ static struct plat_sci_port scif3_platform_data = {

 static struct platform_device scif3_device = {
 	.name		= "sh-sci",
-	.id		= 3,
+	.id		= 1,
 	.dev		= {
 		.platform_data	= &scif3_platform_data,
 	},
@@ -56,7 +56,7 @@ static struct plat_sci_port scif4_platform_data = {

 static struct platform_device scif4_device = {
 	.name		= "sh-sci",
-	.id		= 4,
+	.id		= 2,
 	.dev		= {
 		.platform_data	= &scif4_platform_data,
 	},
-- 
1.5.5

Re: [PATCH] sh: fix the id of scif in SH7757

[Paul Mundt]

On Fri, May 07, 2010 at 06:19:08PM +0900, Yoshihiro Shimoda wrote:
> Because the value of CONFIG_SERIAL_SH_SCI_NR_UARTS is 3.
> 
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

If there are only 3 devices, then why do we have them named scif2, scif3,
and scif4? Presumably there used to be a scif0 and scif1?

Re: [PATCH] sh: fix the id of scif in SH7757

[Yoshihiro Shimoda]

Paul Mundt wrote:
> On Fri, May 07, 2010 at 06:19:08PM +0900, Yoshihiro Shimoda wrote:
>> Because the value of CONFIG_SERIAL_SH_SCI_NR_UARTS is 3.
>>
>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> 
> If there are only 3 devices, then why do we have them named scif2, scif3,
> and scif4? Presumably there used to be a scif0 and scif1?

Yes, this cpu also has scif0 and scif1.
But those scif is only named "SCIF0" and "SCIF1".
Actually those functions are 16550 based serial port.
So I made this patch.

Thanks,
Yoshihiro Shimoda

Re: [PATCH] sh: fix the id of scif in SH7757

[Paul Mundt]

On Fri, May 07, 2010 at 06:50:48PM +0900, Yoshihiro Shimoda wrote:
> Paul Mundt wrote:
> > On Fri, May 07, 2010 at 06:19:08PM +0900, Yoshihiro Shimoda wrote:
> >> Because the value of CONFIG_SERIAL_SH_SCI_NR_UARTS is 3.
> >>
> >> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > 
> > If there are only 3 devices, then why do we have them named scif2, scif3,
> > and scif4? Presumably there used to be a scif0 and scif1?
> 
> Yes, this cpu also has scif0 and scif1.
> But those scif is only named "SCIF0" and "SCIF1".
> Actually those functions are 16550 based serial port.
> 
If the 16550 based UARTs have been named SCIF0 and SCIF1 that really
doesn't bode well for the rest of the CPU..

I'll apply it, thanks for the clarification.