diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-29 12:41:41 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-29 12:41:41 -0500 |
| commit | a207140b24b721e45107c9ba9b11cd3b813d517e (patch) | |
| tree | 0e3207da9454f44c23c8fbfc23bef4c8ee186ac0 /drivers/tty/serial | |
| parent | 90a44e3e7d9e94f96d8d6c2f70789f8eeb594ca8 (diff) | |
| parent | 9b609ba2c2df8290054e5c62be69101b43e2a976 (diff) | |
Merge tag 'v4.9.62' into v4.9-rt
This is the 4.9.62 stable release
Conflicts:
include/linux/preempt.h
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 7e97a1ccab23..15eaea53b3df 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -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, |