Skip to content

Commit b5e3277

Browse files
hshahaxiadogregkh
authored andcommitted
serial: xilinx_uartps: read reg size from DTS
Current implementation uses `CDNS_UART_REGISTER_SPACE(0x1000)` for request_mem_region() and ioremap() in cdns_uart_request_port() API. The cadence/xilinx IP has register space defined from offset 0x0 to 0x48. It also mentions that the register map is defined as [6:0]. So, the upper region may/maynot be used based on the IP integration. In Axiado AX3000 SoC two UART instances are defined 0x100 apart. That is creating issue in some other instance due to overlap with addresses. Since, this address space is already being defined in the devicetree, use the same when requesting the register space. Fixes: 1f70557 ("arm64: dts: axiado: Add initial support for AX3000 SoC and eval board") Acked-by: Michal Simek <[email protected]> Signed-off-by: Harshit Shah <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent cfd956d commit b5e3277

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/tty/serial/xilinx_uartps.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#define CDNS_UART_MINOR 0 /* works best with devtmpfs */
3434
#define CDNS_UART_NR_PORTS 16
3535
#define CDNS_UART_FIFO_SIZE 64 /* FIFO size */
36-
#define CDNS_UART_REGISTER_SPACE 0x1000
3736
#define TX_TIMEOUT 500000
3837

3938
/* Rx Trigger level */
@@ -1098,15 +1097,15 @@ static int cdns_uart_verify_port(struct uart_port *port,
10981097
*/
10991098
static int cdns_uart_request_port(struct uart_port *port)
11001099
{
1101-
if (!request_mem_region(port->mapbase, CDNS_UART_REGISTER_SPACE,
1100+
if (!request_mem_region(port->mapbase, port->mapsize,
11021101
CDNS_UART_NAME)) {
11031102
return -ENOMEM;
11041103
}
11051104

1106-
port->membase = ioremap(port->mapbase, CDNS_UART_REGISTER_SPACE);
1105+
port->membase = ioremap(port->mapbase, port->mapsize);
11071106
if (!port->membase) {
11081107
dev_err(port->dev, "Unable to map registers\n");
1109-
release_mem_region(port->mapbase, CDNS_UART_REGISTER_SPACE);
1108+
release_mem_region(port->mapbase, port->mapsize);
11101109
return -ENOMEM;
11111110
}
11121111
return 0;
@@ -1121,7 +1120,7 @@ static int cdns_uart_request_port(struct uart_port *port)
11211120
*/
11221121
static void cdns_uart_release_port(struct uart_port *port)
11231122
{
1124-
release_mem_region(port->mapbase, CDNS_UART_REGISTER_SPACE);
1123+
release_mem_region(port->mapbase, port->mapsize);
11251124
iounmap(port->membase);
11261125
port->membase = NULL;
11271126
}
@@ -1780,6 +1779,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
17801779
* and triggers invocation of the config_port() entry point.
17811780
*/
17821781
port->mapbase = res->start;
1782+
port->mapsize = resource_size(res);
17831783
port->irq = irq;
17841784
port->dev = &pdev->dev;
17851785
port->uartclk = clk_get_rate(cdns_uart_data->uartclk);

0 commit comments

Comments
 (0)