Skip to contentSkip to conversation

sh-sci: convert sh3 cpus to single port devices

PATCH New Magnus Damm 1 participant 1 message Jan 21, 2009 SuperH

lore
Share & tools
lore

Magnus Damm

author
#0 lore raw

PATCH 11/13 sh-sci: convert sh3 cpus to single port devices

From: Magnus Damm <[email protected]>

Rework sh-sci platform data for sh3 processors such as:
sh770x, sh7705, sh7710 and sh7720

Signed-off-by Magnus Damm <[email protected]>

---

 arch/sh/kernel/cpu/sh3/setup-sh7705.c |   43 +++++++++++--------
 arch/sh/kernel/cpu/sh3/setup-sh770x.c |   72 +++++++++++++++++++++------------
 arch/sh/kernel/cpu/sh3/setup-sh7710.c |   42 +++++++++++--------
 arch/sh/kernel/cpu/sh3/setup-sh7720.c |   42 +++++++++++--------
 4 files changed, 120 insertions(+), 79 deletions(-)
arch/sh/kernel/cpu/sh3/setup-sh7705.c +25 -18
@@ -81,27 +81,33 @@ static struct intc_prio_reg prio_registe
 static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, groups,
 			 NULL, prio_registers, NULL);
 
-static struct plat_sci_port sci_platform_data[] = {
-	{
-		.mapbase	= 0xa4410000,
-		.flags		= UPF_BOOT_AUTOCONF,
-		.type		= PORT_SCIF,
-		.irqs		= { 56, 57, 59 },
-	}, {
-		.mapbase	= 0xa4400000,
-		.flags		= UPF_BOOT_AUTOCONF,
-		.type		= PORT_SCIF,
-		.irqs		= { 52, 53, 55 },
-	}, {
-		.flags = 0,
-	}
+static struct plat_sci_port scif0_platform_data = {
+	.mapbase	= 0xa4410000,
+	.flags		= UPF_BOOT_AUTOCONF,
+	.type		= PORT_SCIF,
+	.irqs		= { 56, 57, 59 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif0_device = {
 	.name		= "sh-sci",
-	.id		= -1,
+	.id		= 0,
+	.dev		= {
+		.platform_data	= &scif0_platform_data,
+	},
+};
+
+static struct plat_sci_port scif1_platform_data = {
+	.mapbase	= 0xa4400000,
+	.flags		= UPF_BOOT_AUTOCONF,
+	.type		= PORT_SCIF,
+	.irqs		= { 52, 53, 55 },
+};
+
+static struct platform_device scif1_device = {
+	.name		= "sh-sci",
+	.id		= 1,
 	.dev		= {
-		.platform_data	= sci_platform_data,
+		.platform_data	= &scif1_platform_data,
 	},
 };
 

@@ -140,7 +146,8 @@ static struct platform_device rtc_device
 };
 
 static struct platform_device *sh7705_devices[] __initdata = {
-	&sci_device,
+	&scif0_device,
+	&scif1_device,
 	&rtc_device,
 };
arch/sh/kernel/cpu/sh3/setup-sh770x.c +47 -25

94 lines not on this page · raw message

arch/sh/kernel/cpu/sh3/setup-sh7710.c +24 -18

57 lines not on this page · raw message

arch/sh/kernel/cpu/sh3/setup-sh7720.c +24 -18

59 lines not on this page · raw message