luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sc16is7xx: save and use per-chip line number

Browse Source 
In preparation of supporting multiple devices we should save
the per-chip line number (0 or 1), because the uart_port line
will reflect system-wide uart number and will be offseted for
chips other than the first to register.

Signed-off-by: Jakub Kicinski <kubakici@wp.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jakub Kicinski 2015-07-31 14:44:22 +02:00 committed by Greg Kroah-Hartman
parent 8cd90e50d1
commit e92a886bf7
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/tty/serial/sc16is7xx.c
View File

@ -312,6 +312,7 @@ struct sc16is7xx_one_config {
struct sc16is7xx_one { struct sc16is7xx_one {
struct uart_port port; struct uart_port port;
u8 line;
struct kthread_work tx_work; struct kthread_work tx_work;
struct kthread_work reg_work; struct kthread_work reg_work;
struct sc16is7xx_one_config config; struct sc16is7xx_one_config config;
@ -335,13 +336,20 @@ struct sc16is7xx_port {
#define to_sc16is7xx_port(p,e) ((container_of((p), struct sc16is7xx_port, e))) #define to_sc16is7xx_port(p,e) ((container_of((p), struct sc16is7xx_port, e)))
#define to_sc16is7xx_one(p,e) ((container_of((p), struct sc16is7xx_one, e))) #define to_sc16is7xx_one(p,e) ((container_of((p), struct sc16is7xx_one, e)))
static int sc16is7xx_line(struct uart_port *port)
{
struct sc16is7xx_one *one = to_sc16is7xx_one(port, port);
return one->line;
}
static u8 sc16is7xx_port_read(struct uart_port *port, u8 reg) static u8 sc16is7xx_port_read(struct uart_port *port, u8 reg)
{ {
struct sc16is7xx_port *s = dev_get_drvdata(port->dev); struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
unsigned int val = 0; unsigned int val = 0;
const u8 line = sc16is7xx_line(port);
regmap_read(s->regmap, regmap_read(s->regmap, (reg << SC16IS7XX_REG_SHIFT) | line, &val);
(reg << SC16IS7XX_REG_SHIFT) | port->line, &val);
return val; return val;
} }
@ -349,15 +357,16 @@ static u8 sc16is7xx_port_read(struct uart_port *port, u8 reg)
static void sc16is7xx_port_write(struct uart_port *port, u8 reg, u8 val) static void sc16is7xx_port_write(struct uart_port *port, u8 reg, u8 val)
{ {
struct sc16is7xx_port *s = dev_get_drvdata(port->dev); struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
const u8 line = sc16is7xx_line(port);
regmap_write(s->regmap, regmap_write(s->regmap, (reg << SC16IS7XX_REG_SHIFT) | line, val);
(reg << SC16IS7XX_REG_SHIFT) | port->line, val);
} }
static void sc16is7xx_fifo_read(struct uart_port *port, unsigned int rxlen) static void sc16is7xx_fifo_read(struct uart_port *port, unsigned int rxlen)
{ {
struct sc16is7xx_port *s = dev_get_drvdata(port->dev); struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
u8 addr = (SC16IS7XX_RHR_REG << SC16IS7XX_REG_SHIFT) | port->line; const u8 line = sc16is7xx_line(port);
u8 addr = (SC16IS7XX_RHR_REG << SC16IS7XX_REG_SHIFT) | line;
regcache_cache_bypass(s->regmap, true); regcache_cache_bypass(s->regmap, true);
regmap_raw_read(s->regmap, addr, s->buf, rxlen); regmap_raw_read(s->regmap, addr, s->buf, rxlen);
@ -367,7 +376,8 @@ static void sc16is7xx_fifo_read(struct uart_port *port, unsigned int rxlen)
static void sc16is7xx_fifo_write(struct uart_port *port, u8 to_send) static void sc16is7xx_fifo_write(struct uart_port *port, u8 to_send)
{ {
struct sc16is7xx_port *s = dev_get_drvdata(port->dev); struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
u8 addr = (SC16IS7XX_THR_REG << SC16IS7XX_REG_SHIFT) | port->line; const u8 line = sc16is7xx_line(port);
u8 addr = (SC16IS7XX_THR_REG << SC16IS7XX_REG_SHIFT) | line;
regcache_cache_bypass(s->regmap, true); regcache_cache_bypass(s->regmap, true);
regmap_raw_write(s->regmap, addr, s->buf, to_send); regmap_raw_write(s->regmap, addr, s->buf, to_send);
@ -378,9 +388,9 @@ static void sc16is7xx_port_update(struct uart_port *port, u8 reg,
u8 mask, u8 val) u8 mask, u8 val)
{ {
struct sc16is7xx_port *s = dev_get_drvdata(port->dev); struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
const u8 line = sc16is7xx_line(port);
regmap_update_bits(s->regmap, regmap_update_bits(s->regmap, (reg << SC16IS7XX_REG_SHIFT) | line,
(reg << SC16IS7XX_REG_SHIFT) | port->line,
mask, val); mask, val);
} }
@ -508,7 +518,7 @@ static void sc16is7xx_handle_rx(struct uart_port *port, unsigned int rxlen,
if (unlikely(rxlen >= sizeof(s->buf))) { if (unlikely(rxlen >= sizeof(s->buf))) {
dev_warn_ratelimited(port->dev, dev_warn_ratelimited(port->dev,
"Port %i: Possible RX FIFO overrun: %d\n", "ttySC%i: Possible RX FIFO overrun: %d\n",
port->line, rxlen); port->line, rxlen);
port->icount.buf_overrun++; port->icount.buf_overrun++;
/* Ensure sanity of RX level */ /* Ensure sanity of RX level */
@ -649,7 +659,7 @@ static void sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno)
break; break;
default: default:
dev_err_ratelimited(port->dev, dev_err_ratelimited(port->dev,
"Port %i: Unexpected interrupt: %x", "ttySC%i: Unexpected interrupt: %x",
port->line, iir); port->line, iir);
break; break;
} }
@ -1174,6 +1184,7 @@ static int sc16is7xx_probe(struct device *dev,
#endif #endif
for (i = 0; i < devtype->nr_uart; ++i) { for (i = 0; i < devtype->nr_uart; ++i) {
s->p[i].line = i;
/* Initialize port data */ /* Initialize port data */
s->p[i].port.line = i; s->p[i].port.line = i;
s->p[i].port.dev = dev; s->p[i].port.dev = dev;