a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit a752ba18af8285e3eeda572f40dddaebff0c3621 ]

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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Laurent Pinchart 2017-01-11 16:43:32 +02:00 committed by Greg Kroah-Hartman
parent ca2090aa58
commit 6450c9a96f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sh/kernel/cpu/sh3/setup-sh770x.c
View File

@ -165,7 +165,6 @@ static struct plat_sci_port scif2_platform_data = {
.scscr = SCSCR_TE | SCSCR_RE, .scscr = SCSCR_TE | SCSCR_RE,
.type = PORT_IRDA, .type = PORT_IRDA,
.ops = &sh770x_sci_port_ops, .ops = &sh770x_sci_port_ops,
.regshift = 1,
}; };
static struct resource scif2_resources[] = { static struct resource scif2_resources[] = {

17
drivers/tty/serial/sh-sci.c
View File

@ -163,18 +163,17 @@ static const struct plat_sci_reg sci_regmap[SCIx_NR_REGTYPES][SCIx_NR_REGS] = {
}, },
/* /*
* Common definitions for legacy IrDA ports, dependent on * Common definitions for legacy IrDA ports.
* regshift value.
*/ */
[SCIx_IRDA_REGTYPE] = { [SCIx_IRDA_REGTYPE] = {
[SCSMR] = { 0x00, 8 }, [SCSMR] = { 0x00, 8 },
[SCBRR] = { 0x01, 8 }, [SCBRR] = { 0x02, 8 },
[SCSCR] = { 0x02, 8 }, [SCSCR] = { 0x04, 8 },
[SCxTDR] = { 0x03, 8 }, [SCxTDR] = { 0x06, 8 },
[SCxSR] = { 0x04, 8 }, [SCxSR] = { 0x08, 16 },
[SCxRDR] = { 0x05, 8 }, [SCxRDR] = { 0x0a, 8 },
[SCFCR] = { 0x06, 8 }, [SCFCR] = { 0x0c, 8 },
[SCFDR] = { 0x07, 16 }, [SCFDR] = { 0x0e, 16 },
[SCTFDR] = sci_reg_invalid, [SCTFDR] = sci_reg_invalid,
[SCRFDR] = sci_reg_invalid, [SCRFDR] = sci_reg_invalid,
[SCSPTR] = sci_reg_invalid, [SCSPTR] = sci_reg_invalid,