serial: sh-sci: Abstract register maps.

This takes a bit of a sledgehammer to the horribly CPU subtype
ifdef-ridden header and abstracts all of the different register layouts
in to distinct types which in turn can be overriden on a per-port basis,
or permitted to default to the map matching the port type at probe time.

In the process this ultimately fixes up inumerable bugs with mismatches
on various CPU types (particularly the legacy ones that were obviously
broken years ago and no one noticed) and provides a more tightly coupled
and consolidated platform for extending and implementing generic
features.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 36 insertions, 0 deletions

diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index ecefec7c0b67..4ca130a90ea5 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -58,6 +58,22 @@ enum {
         SCIx_NR_IRQS,
 };
 
+enum {
+        SCIx_PROBE_REGTYPE,
+
+        SCIx_SCI_REGTYPE,
+        SCIx_IRDA_REGTYPE,
+        SCIx_SCIFA_REGTYPE,
+        SCIx_SCIFB_REGTYPE,
+        SCIx_SH3_SCIF_REGTYPE,
+        SCIx_SH4_SCIF_REGTYPE,
+        SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
+        SCIx_SH4_SCIF_FIFODATA_REGTYPE,
+        SCIx_SH7705_SCIF_REGTYPE,
+
+        SCIx_NR_REGTYPES,
+};
+
 #define SCIx_IRQ_MUXED(irq)             \
 {                                       \
         [SCIx_ERI_IRQ]  = (irq),        \
@@ -66,8 +82,24 @@ enum {
         [SCIx_BRI_IRQ]  = (irq),        \
 }
 
+/*
+ * SCI register subset common for all port types.
+ * Not all registers will exist on all parts.
+ */
+enum {
+        SCSMR, SCBRR, SCSCR, SCxSR,
+        SCFCR, SCFDR, SCxTDR, SCxRDR,
+        SCLSR, SCTFDR, SCRFDR, SCSPTR,
+
+        SCIx_NR_REGS,
+};
+
 struct device;
 
+struct plat_sci_port_ops {
+        void (*init_pins)(struct uart_port *, unsigned int cflag);
+};
+
 /*
  * Platform device specific platform_data struct
  */
@@ -87,6 +119,10 @@ struct plat_sci_port {
         unsigned int    error_mask;
 
         int             port_reg;
+        unsigned char   regshift;
+        unsigned char   regtype;
+
+        struct plat_sci_port_ops        *ops;
 
         struct device   *dma_dev;