diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:53:15 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:53:15 +1100 |
| commit | 475ca8ce606032e9bd7bde1d5950a57cf1ac782b (patch) | |
| tree | cbdc2d695221c89aff184fe1600bab7d80003057 /include | |
| parent | 24035e3af6d9ea1aab89a107cb5e743a4e674614 (diff) | |
| parent | 18e9550273b8a4d28044202f51cb2c3c9254d7c6 (diff) | |
Merge remote-tracking branch 'sh/sh-latest'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_sci.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index 1630d9cae22a..a2afc9fbe186 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h @@ -34,28 +34,32 @@ enum { SCIx_NR_IRQS, }; +#define SCIx_IRQ_MUXED(irq) \ +{ \ + [SCIx_ERI_IRQ] = (irq), \ + [SCIx_RXI_IRQ] = (irq), \ + [SCIx_TXI_IRQ] = (irq), \ + [SCIx_BRI_IRQ] = (irq), \ +} + struct device; /* * Platform device specific platform_data struct */ struct plat_sci_port { - void __iomem *membase; /* io cookie */ unsigned long mapbase; /* resource base */ unsigned int irqs[SCIx_NR_IRQS]; /* ERI, RXI, TXI, BRI */ unsigned int type; /* SCI / SCIF / IRDA */ upf_t flags; /* UPF_* flags */ - char *clk; /* clock string */ 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 + unsigned int dma_slave_tx; + unsigned int dma_slave_rx; }; #endif /* __LINUX_SERIAL_SCI_H */ |