Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...

[pandora-kernel.git] / include / linux / serial_sci.h

diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index ff856b5..1630d9c 100644 (file)
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -2,6 +2,7 @@
 #define __LINUX_SERIAL_SCI_H
 
 #include <linux/serial_core.h>
+#include <linux/sh_dma.h>
 
 /*
  * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)
@@ -19,7 +20,7 @@ enum {
 #define SCSCR_RIE      (1 << 6)
 #define SCSCR_TE       (1 << 5)
 #define SCSCR_RE       (1 << 4)
-#define SCSCR_REIE     (1 << 3)
+#define SCSCR_REIE     (1 << 3)        /* not supported by all parts */
 #define SCSCR_TOIE     (1 << 2)        /* not supported by all parts */
 #define SCSCR_CKE1     (1 << 1)
 #define SCSCR_CKE0     (1 << 0)
@@ -33,6 +34,8 @@ enum {
        SCIx_NR_IRQS,
 };
 
+struct device;
+
 /*
  * Platform device specific platform_data struct
  */
@@ -46,6 +49,13 @@ struct plat_sci_port {
 
        unsigned int    scbrr_algo_id;          /* SCBRR calculation algo */
        unsigned int    scscr;                  /* SCSCR initialization */
+
+       struct device   *dma_dev;
+
+#ifdef CONFIG_SERIAL_SH_SCI_DMA
+       unsigned int dma_slave_tx;
+       unsigned int dma_slave_rx;
+#endif
 };
 
 #endif /* __LINUX_SERIAL_SCI_H */