diff options
author | Chris Brandt <chris.brandt@renesas.com> | 2018-07-31 06:41:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-02 04:07:09 -0400 |
commit | 7acece71a517cad83a0842a94d94c13f271b680c (patch) | |
tree | e782ed3d161232294abcc2760bdecfaf9cb10b25 | |
parent | 2d4dd0da45401c7ae7332b4d1eb7bbb1348edde9 (diff) |
serial: sh-sci: Remove SCIx_RZ_SCIFA_REGTYPE
There is no more need for SCIx_RZ_SCIFA_REGTYPE now that
SCIx_SH4_SCIF_REGTYPE can provide the same register/address definitions.
Also, R7S9210 no longer needs a special compatible since the standard
"renesas,scif" will work just fine.
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/sh-sci.c | 31 | ||||
-rw-r--r-- | include/linux/serial_sci.h | 1 |
2 files changed, 0 insertions, 32 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index c29244f76057..54ea58bbe3c9 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c | |||
@@ -294,33 +294,6 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = { | |||
294 | }, | 294 | }, |
295 | 295 | ||
296 | /* | 296 | /* |
297 | * The "SCIFA" that is in RZ/T and RZ/A2. | ||
298 | * It looks like a normal SCIF with FIFO data, but with a | ||
299 | * compressed address space. Also, the break out of interrupts | ||
300 | * are different: ERI/BRI, RXI, TXI, TEI, DRI. | ||
301 | */ | ||
302 | [SCIx_RZ_SCIFA_REGTYPE] = { | ||
303 | .regs = { | ||
304 | [SCSMR] = { 0x00, 16 }, | ||
305 | [SCBRR] = { 0x02, 8 }, | ||
306 | [SCSCR] = { 0x04, 16 }, | ||
307 | [SCxTDR] = { 0x06, 8 }, | ||
308 | [SCxSR] = { 0x08, 16 }, | ||
309 | [SCxRDR] = { 0x0A, 8 }, | ||
310 | [SCFCR] = { 0x0C, 16 }, | ||
311 | [SCFDR] = { 0x0E, 16 }, | ||
312 | [SCSPTR] = { 0x10, 16 }, | ||
313 | [SCLSR] = { 0x12, 16 }, | ||
314 | }, | ||
315 | .fifosize = 16, | ||
316 | .overrun_reg = SCLSR, | ||
317 | .overrun_mask = SCLSR_ORER, | ||
318 | .sampling_rate_mask = SCI_SR(32), | ||
319 | .error_mask = SCIF_DEFAULT_ERROR_MASK, | ||
320 | .error_clear = SCIF_ERROR_CLEAR, | ||
321 | }, | ||
322 | |||
323 | /* | ||
324 | * Common SH-3 SCIF definitions. | 297 | * Common SH-3 SCIF definitions. |
325 | */ | 298 | */ |
326 | [SCIx_SH3_SCIF_REGTYPE] = { | 299 | [SCIx_SH3_SCIF_REGTYPE] = { |
@@ -3148,10 +3121,6 @@ static const struct of_device_id of_sci_match[] = { | |||
3148 | .compatible = "renesas,scif-r7s72100", | 3121 | .compatible = "renesas,scif-r7s72100", |
3149 | .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH2_SCIF_FIFODATA_REGTYPE), | 3122 | .data = SCI_OF_DATA(PORT_SCIF, SCIx_SH2_SCIF_FIFODATA_REGTYPE), |
3150 | }, | 3123 | }, |
3151 | { | ||
3152 | .compatible = "renesas,scif-r7s9210", | ||
3153 | .data = SCI_OF_DATA(PORT_SCIF, SCIx_RZ_SCIFA_REGTYPE), | ||
3154 | }, | ||
3155 | /* Family-specific types */ | 3124 | /* Family-specific types */ |
3156 | { | 3125 | { |
3157 | .compatible = "renesas,rcar-gen1-scif", | 3126 | .compatible = "renesas,rcar-gen1-scif", |
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index 1c89611e0e06..c0e795d95477 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h | |||
@@ -36,7 +36,6 @@ enum { | |||
36 | SCIx_SH4_SCIF_FIFODATA_REGTYPE, | 36 | SCIx_SH4_SCIF_FIFODATA_REGTYPE, |
37 | SCIx_SH7705_SCIF_REGTYPE, | 37 | SCIx_SH7705_SCIF_REGTYPE, |
38 | SCIx_HSCIF_REGTYPE, | 38 | SCIx_HSCIF_REGTYPE, |
39 | SCIx_RZ_SCIFA_REGTYPE, | ||
40 | 39 | ||
41 | SCIx_NR_REGTYPES, | 40 | SCIx_NR_REGTYPES, |
42 | }; | 41 | }; |