Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31105725 authored by Paul Mundt's avatar Paul Mundt
Browse files

ARM: mach-shmobile: Correct SCIF port types for SH7367. 



While SH7377 and others were updated to properly use SCIFA/B port types,
SH7367 was left behind. Fix it up accordingly.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 485b2ab5

arch/arm/mach-shmobile/setup-sh7367.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ static struct plat_sci_port scif0_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0xc00), evt2irq(0xc00),

	.irqs		= { evt2irq(0xc00), evt2irq(0xc00),

			    evt2irq(0xc00), evt2irq(0xc00) },

			    evt2irq(0xc00), evt2irq(0xc00) },

};

};
@@ -57,7 +57,7 @@ static struct plat_sci_port scif1_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0xc20), evt2irq(0xc20),

	.irqs		= { evt2irq(0xc20), evt2irq(0xc20),

			    evt2irq(0xc20), evt2irq(0xc20) },

			    evt2irq(0xc20), evt2irq(0xc20) },

};

};
@@ -76,7 +76,7 @@ static struct plat_sci_port scif2_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0xc40), evt2irq(0xc40),

	.irqs		= { evt2irq(0xc40), evt2irq(0xc40),

			    evt2irq(0xc40), evt2irq(0xc40) },

			    evt2irq(0xc40), evt2irq(0xc40) },

};

};
@@ -95,7 +95,7 @@ static struct plat_sci_port scif3_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0xc60), evt2irq(0xc60),

	.irqs		= { evt2irq(0xc60), evt2irq(0xc60),

			    evt2irq(0xc60), evt2irq(0xc60) },

			    evt2irq(0xc60), evt2irq(0xc60) },

};

};
@@ -114,7 +114,7 @@ static struct plat_sci_port scif4_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0xd20), evt2irq(0xd20),

	.irqs		= { evt2irq(0xd20), evt2irq(0xd20),

			    evt2irq(0xd20), evt2irq(0xd20) },

			    evt2irq(0xd20), evt2irq(0xd20) },

};

};
@@ -133,7 +133,7 @@ static struct plat_sci_port scif5_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.type		= PORT_SCIFA,

	.irqs		= { evt2irq(0xd40), evt2irq(0xd40),

	.irqs		= { evt2irq(0xd40), evt2irq(0xd40),

			    evt2irq(0xd40), evt2irq(0xd40) },

			    evt2irq(0xd40), evt2irq(0xd40) },

};

};
@@ -152,7 +152,7 @@ static struct plat_sci_port scif6_platform_data = { 
	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scscr		= SCSCR_RE | SCSCR_TE,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.scbrr_algo_id	= SCBRR_ALGO_4,

	.type		= PORT_SCIF,

	.type		= PORT_SCIFB,

	.irqs		= { evt2irq(0xd60), evt2irq(0xd60),

	.irqs		= { evt2irq(0xd60), evt2irq(0xd60),

			    evt2irq(0xd60), evt2irq(0xd60) },

			    evt2irq(0xd60), evt2irq(0xd60) },

};

};