Skip to content

Commit

Permalink
serial: sh-sci: modify sci_break_ctl()
Browse files Browse the repository at this point in the history
SCIF modules which have SCSPTR can output the break signal. Now that we
have a way of determining port features/capabilities, add trivial break
control via SCSPTR support. Tested on sh7757lcr.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Shimoda, Yoshihiro authored and Paul Mundt committed Apr 9, 2012
1 parent 0034102 commit bbb4ce5
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 4 deletions.
30 changes: 26 additions & 4 deletions drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1564,10 +1564,32 @@ static void sci_enable_ms(struct uart_port *port)

static void sci_break_ctl(struct uart_port *port, int break_state)
{
/*
* Not supported by hardware. Most parts couple break and rx
* interrupts together, with break detection always enabled.
*/
struct sci_port *s = to_sci_port(port);
unsigned short scscr, scsptr;

switch (s->cfg->regtype) {
case SCIx_SH4_SCIF_REGTYPE:
scsptr = serial_port_in(port, SCSPTR);
scscr = serial_port_in(port, SCSCR);

if (break_state == -1) {
scsptr = (scsptr | SCSPTR_SPB2IO) & ~SCSPTR_SPB2DT;
scscr &= ~SCSCR_TE;
} else {
scsptr = (scsptr | SCSPTR_SPB2DT) & ~SCSPTR_SPB2IO;
scscr |= SCSCR_TE;
}

serial_port_out(port, SCSPTR, scsptr);
serial_port_out(port, SCSCR, scscr);
break;
default:
/*
* Not supported by hardware. Most parts couple break and rx
* interrupts together, with break detection always enabled.
*/
break;
}
}

#ifdef CONFIG_SERIAL_SH_SCI_DMA
Expand Down
2 changes: 2 additions & 0 deletions include/linux/serial_sci.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ enum {
/* SCSPTR, optional */
#define SCSPTR_RTSIO (1 << 7)
#define SCSPTR_CTSIO (1 << 5)
#define SCSPTR_SPB2IO (1 << 1)
#define SCSPTR_SPB2DT (1 << 0)

/* Offsets into the sci_port->irqs array */
enum {
Expand Down

0 comments on commit bbb4ce5

Please sign in to comment.