diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2014-02-20 13:15:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-28 19:27:18 -0500 |
commit | 5811712ffbf593d98b6cc56461df5be4e9580245 (patch) | |
tree | de7154c8603b655cbcd9b0319e84927bd155c35e | |
parent | f04430ceadbf92e142208cf58904a930417c6480 (diff) |
tty: serial: bcm63xx_uart: define UART_REG_SIZE constant
The bcm63xx_uart driver uses RSET_UART_SIZE which is a constant defined
for MIPS-based BCM63xx platforms, pull this constant value from the
MIPS-specific header and put it in include/linux/serial_bcm63xx.h to
make the driver platform agnostic.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/bcm63xx_uart.c | 4 | ||||
-rw-r--r-- | include/linux/serial_bcm63xx.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c index d71143e4e9df..37e7e336f70a 100644 --- a/drivers/tty/serial/bcm63xx_uart.c +++ b/drivers/tty/serial/bcm63xx_uart.c | |||
@@ -589,7 +589,7 @@ static int bcm_uart_request_port(struct uart_port *port) | |||
589 | { | 589 | { |
590 | unsigned int size; | 590 | unsigned int size; |
591 | 591 | ||
592 | size = RSET_UART_SIZE; | 592 | size = UART_REG_SIZE; |
593 | if (!request_mem_region(port->mapbase, size, "bcm63xx")) { | 593 | if (!request_mem_region(port->mapbase, size, "bcm63xx")) { |
594 | dev_err(port->dev, "Memory region busy\n"); | 594 | dev_err(port->dev, "Memory region busy\n"); |
595 | return -EBUSY; | 595 | return -EBUSY; |
@@ -609,7 +609,7 @@ static int bcm_uart_request_port(struct uart_port *port) | |||
609 | */ | 609 | */ |
610 | static void bcm_uart_release_port(struct uart_port *port) | 610 | static void bcm_uart_release_port(struct uart_port *port) |
611 | { | 611 | { |
612 | release_mem_region(port->mapbase, RSET_UART_SIZE); | 612 | release_mem_region(port->mapbase, UART_REG_SIZE); |
613 | iounmap(port->membase); | 613 | iounmap(port->membase); |
614 | } | 614 | } |
615 | 615 | ||
diff --git a/include/linux/serial_bcm63xx.h b/include/linux/serial_bcm63xx.h index 570e964dc899..a80aa1a5bee2 100644 --- a/include/linux/serial_bcm63xx.h +++ b/include/linux/serial_bcm63xx.h | |||
@@ -116,4 +116,6 @@ | |||
116 | UART_FIFO_PARERR_MASK | \ | 116 | UART_FIFO_PARERR_MASK | \ |
117 | UART_FIFO_BRKDET_MASK) | 117 | UART_FIFO_BRKDET_MASK) |
118 | 118 | ||
119 | #define UART_REG_SIZE 24 | ||
120 | |||
119 | #endif /* _LINUX_SERIAL_BCM63XX_H */ | 121 | #endif /* _LINUX_SERIAL_BCM63XX_H */ |