Merge tag 'renesas-sh-sci3-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

From Simon Horman:
Third Round of Renesas SH SCI Updates for v3.14

* Add Device Tree Support
* Remove platform data mapbase and irqs fields
* Remove platform data scbrr_algo_id field

* tag 'renesas-sh-sci3-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  serial: sh-sci: Add OF support
  serial: sh-sci: Add device tree bindings documentation
  serial: sh-sci: Remove platform data mapbase and irqs fields
  serial: sh-sci: Remove platform data scbrr_algo_id field

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 0 insertions, 36 deletions

diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index af414e1895a5..22b3640c9424 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -10,15 +10,6 @@
 
 #define SCIx_NOT_SUPPORTED      (-1)
 
-enum {
-        SCBRR_ALGO_NONE,        /* Compute sampling rate in the driver */
-        SCBRR_ALGO_1,           /* clk / (16 * bps) */
-        SCBRR_ALGO_2,           /* DIV_ROUND_CLOSEST(clk, 32 * bps) - 1 */
-        SCBRR_ALGO_3,           /* clk / (8 * bps) */
-        SCBRR_ALGO_4,           /* DIV_ROUND_CLOSEST(clk, 16 * bps) - 1 */
-        SCBRR_ALGO_6,           /* HSCIF variable sample rate algorithm */
-};
-
 #define SCSCR_TIE       (1 << 7)
 #define SCSCR_RIE       (1 << 6)
 #define SCSCR_TE        (1 << 5)
@@ -59,17 +50,6 @@ enum {
 /* HSSRR HSCIF */
 #define HSCIF_SRE       0x8000
 
-/* Offsets into the sci_port->irqs array */
-enum {
-        SCIx_ERI_IRQ,
-        SCIx_RXI_IRQ,
-        SCIx_TXI_IRQ,
-        SCIx_BRI_IRQ,
-        SCIx_NR_IRQS,
-
-        SCIx_MUX_IRQ = SCIx_NR_IRQS,    /* special case */
-};
-
 enum {
         SCIx_PROBE_REGTYPE,
 
@@ -88,19 +68,6 @@ enum {
         SCIx_NR_REGTYPES,
 };
 
-#define SCIx_IRQ_MUXED(irq)             \
-{                                       \
-        [SCIx_ERI_IRQ]  = (irq),        \
-        [SCIx_RXI_IRQ]  = (irq),        \
-        [SCIx_TXI_IRQ]  = (irq),        \
-        [SCIx_BRI_IRQ]  = (irq),        \
-}
-
-#define SCIx_IRQ_IS_MUXED(port)                 \
-        ((port)->irqs[SCIx_ERI_IRQ] ==  \
-         (port)->irqs[SCIx_RXI_IRQ]) || \
-        ((port)->irqs[SCIx_ERI_IRQ] &&  \
-         ((port)->irqs[SCIx_RXI_IRQ] < 0))
 /*
  * SCI register subset common for all port types.
  * Not all registers will exist on all parts.
@@ -129,14 +96,11 @@ struct plat_sci_port_ops {
  * Platform device specific platform_data struct
  */
 struct plat_sci_port {
-        unsigned long   mapbase;                /* resource base */
-        unsigned int    irqs[SCIx_NR_IRQS];     /* ERI, RXI, TXI, BRI */
         unsigned int    type;                   /* SCI / SCIF / IRDA / HSCIF */
         upf_t           flags;                  /* UPF_* flags */
         unsigned long   capabilities;           /* Port features/capabilities */
 
         unsigned int    sampling_rate;
-        unsigned int    scbrr_algo_id;          /* SCBRR calculation algo */
         unsigned int    scscr;                  /* SCSCR initialization */
 
         /*