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

Commit a752ba18 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Greg Kroah-Hartman
Browse files

serial: sh-sci: Fix register offsets for the IRDA serial port 



Even though most of its registers are 8-bit wide, the IRDA has two
16-bit registers that make it a 16-bit peripheral and not a 8-bit
peripheral with addresses shifted by one. Fix the registers offset in
the driver and the platform data regshift value.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f48debc4

arch/sh/kernel/cpu/sh3/setup-sh770x.c

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ static struct platform_device scif1_device = { 
static struct plat_sci_port scif2_platform_data = {

	.type		= PORT_IRDA,

	.ops		= &sh770x_sci_port_ops,

	.regshift	= 1,

};



static struct resource scif2_resources[] = {

drivers/tty/serial/sh-sci.c

+8 −9
Original line number Diff line number Diff line
@@ -193,18 +193,17 @@ static const struct plat_sci_reg sci_regmap[SCIx_NR_REGTYPES][SCIx_NR_REGS] = { 
	},



	/*

	 * Common definitions for legacy IrDA ports, dependent on

	 * regshift value.

	 * Common definitions for legacy IrDA ports.

	 */

	[SCIx_IRDA_REGTYPE] = {

		[SCSMR]		= { 0x00,  8 },

		[SCBRR]		= { 0x01,  8 },

		[SCSCR]		= { 0x02,  8 },

		[SCxTDR]	= { 0x03,  8 },

		[SCxSR]		= { 0x04,  8 },

		[SCxRDR]	= { 0x05,  8 },

		[SCFCR]		= { 0x06,  8 },

		[SCFDR]		= { 0x07, 16 },

		[SCBRR]		= { 0x02,  8 },

		[SCSCR]		= { 0x04,  8 },

		[SCxTDR]	= { 0x06,  8 },

		[SCxSR]		= { 0x08, 16 },

		[SCxRDR]	= { 0x0a,  8 },

		[SCFCR]		= { 0x0c,  8 },

		[SCFDR]		= { 0x0e, 16 },

		[SCTFDR]	= sci_reg_invalid,

		[SCRFDR]	= sci_reg_invalid,

		[SCSPTR]	= sci_reg_invalid,