|
|
@@ -62,12 +62,6 @@ struct sci_port {
|
|
|
/* Platform configuration */
|
|
|
struct plat_sci_port *cfg;
|
|
|
|
|
|
- /* Port enable callback */
|
|
|
- void (*enable)(struct uart_port *port);
|
|
|
-
|
|
|
- /* Port disable callback */
|
|
|
- void (*disable)(struct uart_port *port);
|
|
|
-
|
|
|
/* Break timer */
|
|
|
struct timer_list break_timer;
|
|
|
int break_flag;
|
|
|
@@ -77,6 +71,8 @@ struct sci_port {
|
|
|
/* Function clock */
|
|
|
struct clk *fclk;
|
|
|
|
|
|
+ char *irqstr[SCIx_NR_IRQS];
|
|
|
+
|
|
|
struct dma_chan *chan_tx;
|
|
|
struct dma_chan *chan_rx;
|
|
|
|
|
|
@@ -366,6 +362,29 @@ static int sci_probe_regmap(struct plat_sci_port *cfg)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static void sci_port_enable(struct sci_port *sci_port)
|
|
|
+{
|
|
|
+ if (!sci_port->port.dev)
|
|
|
+ return;
|
|
|
+
|
|
|
+ pm_runtime_get_sync(sci_port->port.dev);
|
|
|
+
|
|
|
+ clk_enable(sci_port->iclk);
|
|
|
+ sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
|
|
|
+ clk_enable(sci_port->fclk);
|
|
|
+}
|
|
|
+
|
|
|
+static void sci_port_disable(struct sci_port *sci_port)
|
|
|
+{
|
|
|
+ if (!sci_port->port.dev)
|
|
|
+ return;
|
|
|
+
|
|
|
+ clk_disable(sci_port->fclk);
|
|
|
+ clk_disable(sci_port->iclk);
|
|
|
+
|
|
|
+ pm_runtime_put_sync(sci_port->port.dev);
|
|
|
+}
|
|
|
+
|
|
|
#if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_SH_SCI_CONSOLE)
|
|
|
|
|
|
#ifdef CONFIG_CONSOLE_POLL
|
|
|
@@ -651,8 +670,7 @@ static void sci_break_timer(unsigned long data)
|
|
|
{
|
|
|
struct sci_port *port = (struct sci_port *)data;
|
|
|
|
|
|
- if (port->enable)
|
|
|
- port->enable(&port->port);
|
|
|
+ sci_port_enable(port);
|
|
|
|
|
|
if (sci_rxd_in(&port->port) == 0) {
|
|
|
port->break_flag = 1;
|
|
|
@@ -664,8 +682,7 @@ static void sci_break_timer(unsigned long data)
|
|
|
} else
|
|
|
port->break_flag = 0;
|
|
|
|
|
|
- if (port->disable)
|
|
|
- port->disable(&port->port);
|
|
|
+ sci_port_disable(port);
|
|
|
}
|
|
|
|
|
|
static int sci_handle_errors(struct uart_port *port)
|
|
|
@@ -939,74 +956,102 @@ static int sci_notifier(struct notifier_block *self,
|
|
|
return NOTIFY_OK;
|
|
|
}
|
|
|
|
|
|
-static void sci_clk_enable(struct uart_port *port)
|
|
|
-{
|
|
|
- struct sci_port *sci_port = to_sci_port(port);
|
|
|
-
|
|
|
- pm_runtime_get_sync(port->dev);
|
|
|
+static struct sci_irq_desc {
|
|
|
+ const char *desc;
|
|
|
+ irq_handler_t handler;
|
|
|
+} sci_irq_desc[] = {
|
|
|
+ /*
|
|
|
+ * Split out handlers, the default case.
|
|
|
+ */
|
|
|
+ [SCIx_ERI_IRQ] = {
|
|
|
+ .desc = "rx err",
|
|
|
+ .handler = sci_er_interrupt,
|
|
|
+ },
|
|
|
|
|
|
- clk_enable(sci_port->iclk);
|
|
|
- sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
|
|
|
- clk_enable(sci_port->fclk);
|
|
|
-}
|
|
|
+ [SCIx_RXI_IRQ] = {
|
|
|
+ .desc = "rx full",
|
|
|
+ .handler = sci_rx_interrupt,
|
|
|
+ },
|
|
|
|
|
|
-static void sci_clk_disable(struct uart_port *port)
|
|
|
-{
|
|
|
- struct sci_port *sci_port = to_sci_port(port);
|
|
|
+ [SCIx_TXI_IRQ] = {
|
|
|
+ .desc = "tx empty",
|
|
|
+ .handler = sci_tx_interrupt,
|
|
|
+ },
|
|
|
|
|
|
- clk_disable(sci_port->fclk);
|
|
|
- clk_disable(sci_port->iclk);
|
|
|
+ [SCIx_BRI_IRQ] = {
|
|
|
+ .desc = "break",
|
|
|
+ .handler = sci_br_interrupt,
|
|
|
+ },
|
|
|
|
|
|
- pm_runtime_put_sync(port->dev);
|
|
|
-}
|
|
|
+ /*
|
|
|
+ * Special muxed handler.
|
|
|
+ */
|
|
|
+ [SCIx_MUX_IRQ] = {
|
|
|
+ .desc = "mux",
|
|
|
+ .handler = sci_mpxed_interrupt,
|
|
|
+ },
|
|
|
+};
|
|
|
|
|
|
static int sci_request_irq(struct sci_port *port)
|
|
|
{
|
|
|
- int i;
|
|
|
- irqreturn_t (*handlers[4])(int irq, void *ptr) = {
|
|
|
- sci_er_interrupt, sci_rx_interrupt, sci_tx_interrupt,
|
|
|
- sci_br_interrupt,
|
|
|
- };
|
|
|
- const char *desc[] = { "SCI Receive Error", "SCI Receive Data Full",
|
|
|
- "SCI Transmit Data Empty", "SCI Break" };
|
|
|
-
|
|
|
- if (port->cfg->irqs[0] == port->cfg->irqs[1]) {
|
|
|
- if (unlikely(!port->cfg->irqs[0]))
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
- if (request_irq(port->cfg->irqs[0], sci_mpxed_interrupt,
|
|
|
- IRQF_DISABLED, "sci", port)) {
|
|
|
- dev_err(port->port.dev, "Can't allocate IRQ\n");
|
|
|
- return -ENODEV;
|
|
|
+ struct uart_port *up = &port->port;
|
|
|
+ int i, j, ret = 0;
|
|
|
+
|
|
|
+ for (i = j = 0; i < SCIx_NR_IRQS; i++, j++) {
|
|
|
+ struct sci_irq_desc *desc;
|
|
|
+ unsigned int irq;
|
|
|
+
|
|
|
+ if (SCIx_IRQ_IS_MUXED(port)) {
|
|
|
+ i = SCIx_MUX_IRQ;
|
|
|
+ irq = up->irq;
|
|
|
+ } else
|
|
|
+ irq = port->cfg->irqs[i];
|
|
|
+
|
|
|
+ desc = sci_irq_desc + i;
|
|
|
+ port->irqstr[j] = kasprintf(GFP_KERNEL, "%s:%s",
|
|
|
+ dev_name(up->dev), desc->desc);
|
|
|
+ if (!port->irqstr[j]) {
|
|
|
+ dev_err(up->dev, "Failed to allocate %s IRQ string\n",
|
|
|
+ desc->desc);
|
|
|
+ goto out_nomem;
|
|
|
}
|
|
|
- } else {
|
|
|
- for (i = 0; i < ARRAY_SIZE(handlers); i++) {
|
|
|
- if (unlikely(!port->cfg->irqs[i]))
|
|
|
- continue;
|
|
|
-
|
|
|
- if (request_irq(port->cfg->irqs[i], handlers[i],
|
|
|
- IRQF_DISABLED, desc[i], port)) {
|
|
|
- dev_err(port->port.dev, "Can't allocate IRQ\n");
|
|
|
- return -ENODEV;
|
|
|
- }
|
|
|
+
|
|
|
+ ret = request_irq(irq, desc->handler, up->irqflags,
|
|
|
+ port->irqstr[j], port);
|
|
|
+ if (unlikely(ret)) {
|
|
|
+ dev_err(up->dev, "Can't allocate %s IRQ\n", desc->desc);
|
|
|
+ goto out_noirq;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
|
+
|
|
|
+out_noirq:
|
|
|
+ while (--i >= 0)
|
|
|
+ free_irq(port->cfg->irqs[i], port);
|
|
|
+
|
|
|
+out_nomem:
|
|
|
+ while (--j >= 0)
|
|
|
+ kfree(port->irqstr[j]);
|
|
|
+
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static void sci_free_irq(struct sci_port *port)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
|
- if (port->cfg->irqs[0] == port->cfg->irqs[1])
|
|
|
- free_irq(port->cfg->irqs[0], port);
|
|
|
- else {
|
|
|
- for (i = 0; i < ARRAY_SIZE(port->cfg->irqs); i++) {
|
|
|
- if (!port->cfg->irqs[i])
|
|
|
- continue;
|
|
|
+ /*
|
|
|
+ * Intentionally in reverse order so we iterate over the muxed
|
|
|
+ * IRQ first.
|
|
|
+ */
|
|
|
+ for (i = 0; i < SCIx_NR_IRQS; i++) {
|
|
|
+ free_irq(port->cfg->irqs[i], port);
|
|
|
+ kfree(port->irqstr[i]);
|
|
|
|
|
|
- free_irq(port->cfg->irqs[i], port);
|
|
|
+ if (SCIx_IRQ_IS_MUXED(port)) {
|
|
|
+ /* If there's only one IRQ, we're done. */
|
|
|
+ return;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1537,8 +1582,7 @@ static int sci_startup(struct uart_port *port)
|
|
|
|
|
|
dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
|
|
|
|
|
|
- if (s->enable)
|
|
|
- s->enable(port);
|
|
|
+ sci_port_enable(s);
|
|
|
|
|
|
ret = sci_request_irq(s);
|
|
|
if (unlikely(ret < 0))
|
|
|
@@ -1564,8 +1608,7 @@ static void sci_shutdown(struct uart_port *port)
|
|
|
sci_free_dma(port);
|
|
|
sci_free_irq(s);
|
|
|
|
|
|
- if (s->disable)
|
|
|
- s->disable(port);
|
|
|
+ sci_port_disable(s);
|
|
|
}
|
|
|
|
|
|
static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps,
|
|
|
@@ -1612,8 +1655,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
|
|
|
if (likely(baud && port->uartclk))
|
|
|
t = sci_scbrr_calc(s->cfg->scbrr_algo_id, baud, port->uartclk);
|
|
|
|
|
|
- if (s->enable)
|
|
|
- s->enable(port);
|
|
|
+ sci_port_enable(s);
|
|
|
|
|
|
do {
|
|
|
status = sci_in(port, SCxSR);
|
|
|
@@ -1683,8 +1725,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
|
|
|
if ((termios->c_cflag & CREAD) != 0)
|
|
|
sci_start_rx(port);
|
|
|
|
|
|
- if (s->disable)
|
|
|
- s->disable(port);
|
|
|
+ sci_port_disable(s);
|
|
|
}
|
|
|
|
|
|
static const char *sci_type(struct uart_port *port)
|
|
|
@@ -1825,6 +1866,7 @@ static int __devinit sci_init_single(struct platform_device *dev,
|
|
|
struct plat_sci_port *p)
|
|
|
{
|
|
|
struct uart_port *port = &sci_port->port;
|
|
|
+ int ret;
|
|
|
|
|
|
port->ops = &sci_uart_ops;
|
|
|
port->iotype = UPIO_MEM;
|
|
|
@@ -1845,8 +1887,11 @@ static int __devinit sci_init_single(struct platform_device *dev,
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if (p->regtype == SCIx_PROBE_REGTYPE)
|
|
|
- BUG_ON(sci_probe_regmap(p) != 0);
|
|
|
+ if (p->regtype == SCIx_PROBE_REGTYPE) {
|
|
|
+ ret = sci_probe_regmap(p);
|
|
|
+ if (unlikely(!ret))
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
|
|
|
if (dev) {
|
|
|
sci_port->iclk = clk_get(&dev->dev, "sci_ick");
|
|
|
@@ -1866,8 +1911,6 @@ static int __devinit sci_init_single(struct platform_device *dev,
|
|
|
if (IS_ERR(sci_port->fclk))
|
|
|
sci_port->fclk = NULL;
|
|
|
|
|
|
- sci_port->enable = sci_clk_enable;
|
|
|
- sci_port->disable = sci_clk_disable;
|
|
|
port->dev = &dev->dev;
|
|
|
|
|
|
pm_runtime_enable(&dev->dev);
|
|
|
@@ -1918,6 +1961,7 @@ static int __devinit sci_init_single(struct platform_device *dev,
|
|
|
* For the muxed case there's nothing more to do.
|
|
|
*/
|
|
|
port->irq = p->irqs[SCIx_RXI_IRQ];
|
|
|
+ port->irqflags = IRQF_DISABLED;
|
|
|
|
|
|
port->serial_in = sci_serial_in;
|
|
|
port->serial_out = sci_serial_out;
|
|
|
@@ -1946,8 +1990,7 @@ static void serial_console_write(struct console *co, const char *s,
|
|
|
struct uart_port *port = &sci_port->port;
|
|
|
unsigned short bits;
|
|
|
|
|
|
- if (sci_port->enable)
|
|
|
- sci_port->enable(port);
|
|
|
+ sci_port_enable(sci_port);
|
|
|
|
|
|
uart_console_write(port, s, count, serial_console_putchar);
|
|
|
|
|
|
@@ -1956,8 +1999,7 @@ static void serial_console_write(struct console *co, const char *s,
|
|
|
while ((sci_in(port, SCxSR) & bits) != bits)
|
|
|
cpu_relax();
|
|
|
|
|
|
- if (sci_port->disable)
|
|
|
- sci_port->disable(port);
|
|
|
+ sci_port_disable(sci_port);
|
|
|
}
|
|
|
|
|
|
static int __devinit serial_console_setup(struct console *co, char *options)
|
|
|
@@ -1989,8 +2031,7 @@ static int __devinit serial_console_setup(struct console *co, char *options)
|
|
|
if (unlikely(ret != 0))
|
|
|
return ret;
|
|
|
|
|
|
- if (sci_port->enable)
|
|
|
- sci_port->enable(port);
|
|
|
+ sci_port_enable(sci_port);
|
|
|
|
|
|
if (options)
|
|
|
uart_parse_options(options, &baud, &parity, &bits, &flow);
|
|
|
@@ -2207,3 +2248,5 @@ module_exit(sci_exit);
|
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
MODULE_ALIAS("platform:sh-sci");
|
|
|
+MODULE_AUTHOR("Paul Mundt");
|
|
|
+MODULE_DESCRIPTION("SuperH SCI(F) serial driver");
|
Paul Mundt