redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

serial: clps711x: Add support for N_IRDA line discipline

Browse source 
This patch replace custom handling of IrDA feature with N_IRDA
line discipline, so IrDA mode can be used with irtty driver.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Shiyan 2013-12-31 20:49:41 +04:00 committed by Greg Kroah-Hartman
parent b8c98ae49e
commit 71b9e8c669
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Documentation/devicetree/bindings/serial/cirrus,clps711x-uart.txt
View file

@ -9,7 +9,6 @@ Required properties:
Optional properties: Optional properties:
- uart-use-ms: Indicate the UART has modem signal (DCD, DSR, CTS). - uart-use-ms: Indicate the UART has modem signal (DCD, DSR, CTS).
- uart-use-irda: Indicate the UART use IRDA mode.
Note: Each UART port should have an alias correctly numbered Note: Each UART port should have an alias correctly numbered
in "aliases" node. in "aliases" node.

20
drivers/tty/serial/clps711x.c
View file

@ -232,6 +232,16 @@ static void uart_clps711x_break_ctl(struct uart_port *port, int break_state)
writel_relaxed(ubrlcr, port->membase + UBRLCR_OFFSET); writel_relaxed(ubrlcr, port->membase + UBRLCR_OFFSET);
} }
static void uart_clps711x_set_ldisc(struct uart_port *port, int ld)
{
if (!port->line) {
struct clps711x_port *s = dev_get_drvdata(port->dev);
regmap_update_bits(s->syscon, SYSCON_OFFSET, SYSCON1_SIREN,
(ld == N_IRDA) ? SYSCON1_SIREN : 0);
}
}
static int uart_clps711x_startup(struct uart_port *port) static int uart_clps711x_startup(struct uart_port *port)
{ {
struct clps711x_port *s = dev_get_drvdata(port->dev); struct clps711x_port *s = dev_get_drvdata(port->dev);
@ -342,6 +352,7 @@ static const struct uart_ops uart_clps711x_ops = {
.stop_rx = uart_clps711x_nop_void, .stop_rx = uart_clps711x_nop_void,
.enable_ms = uart_clps711x_nop_void, .enable_ms = uart_clps711x_nop_void,
.break_ctl = uart_clps711x_break_ctl, .break_ctl = uart_clps711x_break_ctl,
.set_ldisc = uart_clps711x_set_ldisc,
.startup = uart_clps711x_startup, .startup = uart_clps711x_startup,
.shutdown = uart_clps711x_shutdown, .shutdown = uart_clps711x_shutdown,
.set_termios = uart_clps711x_set_termios, .set_termios = uart_clps711x_set_termios,
@ -482,15 +493,8 @@ static int uart_clps711x_probe(struct platform_device *pdev)
if (IS_ERR(s->syscon)) if (IS_ERR(s->syscon))
return PTR_ERR(s->syscon); return PTR_ERR(s->syscon);
if (!index) { if (!index)
bool use_irda;
s->use_ms = of_property_read_bool(np, "uart-use-ms"); s->use_ms = of_property_read_bool(np, "uart-use-ms");
use_irda = of_property_read_bool(np, "uart-use-irda");
regmap_update_bits(s->syscon, SYSCON_OFFSET,
SYSCON1_SIREN,
use_irda ? SYSCON1_SIREN : 0);
}
} }
s->port.line = index; s->port.line = index;