Skip to contentSkip to conversation

sh: fix the id of scif in SH7757

PATCH In review Yoshihiro Shimoda 2 participants 4 messages May 7, 2010 SuperH

lore
Share & tools
lore

Yoshihiro Shimoda

author
#0 lore raw

PATCH 1/1 sh: fix the id of scif in SH7757

Because the value of CONFIG_SERIAL_SH_SCI_NR_UARTS is 3.

Signed-off-by Yoshihiro Shimoda <[email protected]>
---
 arch/sh/kernel/cpu/sh4a/setup-sh7757.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/sh/kernel/cpu/sh4a/setup-sh7757.c +3 -3
index 444aca9..93b7aa4 100644
@@ -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,
 	},
Signature · 1 line
1.5.5
#1 lore raw
Quoted 3 lines · Yoshihiro Shimoda

Because the value of CONFIG_SERIAL_SH_SCI_NR_UARTS is 3.

Signed-off-by Yoshihiro Shimoda <[email protected]>

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?

author
#2 lore raw
In reply to Yoshihiro Shimoda
Quoted 7 lines · Paul Mundt
Quoted 3 lines · Yoshihiro Shimoda

Because the value of CONFIG_SERIAL_SH_SCI_NR_UARTS is 3.

Signed-off-by Yoshihiro Shimoda <[email protected]>

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

#3 lore raw
In reply to Yoshihiro Shimoda
Quoted 4 lines · Yoshihiro Shimoda
Quoted 3 lines · Paul Mundt
Quoted 2 lines · Yoshihiro Shimoda

Because the value of CONFIG_SERIAL_SH_SCI_NR_UARTS is 3.

Quoted 9 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Yoshihiro Shimoda <[email protected]>

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.