Revert "serial: uartps: Use the same dynamic major number for all ports"
This reverts commit ab26266601
.
As Johan says, this driver needs a lot more work and these changes are
only going in the wrong direction:
https://lkml.kernel.org/r/20190523091839.GC568@localhost
Reported-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/14a565fc1e14a5ec6cc6a6710deb878ae8305f22.1585905873.git.michal.simek@xilinx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2e01911b7c
commit
8da1a3940d
|
@ -26,13 +26,13 @@
|
||||||
|
|
||||||
#define CDNS_UART_TTY_NAME "ttyPS"
|
#define CDNS_UART_TTY_NAME "ttyPS"
|
||||||
#define CDNS_UART_NAME "xuartps"
|
#define CDNS_UART_NAME "xuartps"
|
||||||
|
#define CDNS_UART_MAJOR 0 /* use dynamic node allocation */
|
||||||
#define CDNS_UART_FIFO_SIZE 64 /* FIFO size */
|
#define CDNS_UART_FIFO_SIZE 64 /* FIFO size */
|
||||||
#define CDNS_UART_REGISTER_SPACE 0x1000
|
#define CDNS_UART_REGISTER_SPACE 0x1000
|
||||||
#define TX_TIMEOUT 500000
|
#define TX_TIMEOUT 500000
|
||||||
|
|
||||||
/* Rx Trigger level */
|
/* Rx Trigger level */
|
||||||
static int rx_trigger_level = 56;
|
static int rx_trigger_level = 56;
|
||||||
static int uartps_major;
|
|
||||||
module_param(rx_trigger_level, uint, 0444);
|
module_param(rx_trigger_level, uint, 0444);
|
||||||
MODULE_PARM_DESC(rx_trigger_level, "Rx trigger level, 1-63 bytes");
|
MODULE_PARM_DESC(rx_trigger_level, "Rx trigger level, 1-63 bytes");
|
||||||
|
|
||||||
|
@ -1535,7 +1535,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
|
||||||
cdns_uart_uart_driver->owner = THIS_MODULE;
|
cdns_uart_uart_driver->owner = THIS_MODULE;
|
||||||
cdns_uart_uart_driver->driver_name = driver_name;
|
cdns_uart_uart_driver->driver_name = driver_name;
|
||||||
cdns_uart_uart_driver->dev_name = CDNS_UART_TTY_NAME;
|
cdns_uart_uart_driver->dev_name = CDNS_UART_TTY_NAME;
|
||||||
cdns_uart_uart_driver->major = uartps_major;
|
cdns_uart_uart_driver->major = CDNS_UART_MAJOR;
|
||||||
cdns_uart_uart_driver->minor = cdns_uart_data->id;
|
cdns_uart_uart_driver->minor = cdns_uart_data->id;
|
||||||
cdns_uart_uart_driver->nr = 1;
|
cdns_uart_uart_driver->nr = 1;
|
||||||
|
|
||||||
|
@ -1564,7 +1564,6 @@ static int cdns_uart_probe(struct platform_device *pdev)
|
||||||
goto err_out_id;
|
goto err_out_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
uartps_major = cdns_uart_uart_driver->tty_driver->major;
|
|
||||||
cdns_uart_data->cdns_uart_driver = cdns_uart_uart_driver;
|
cdns_uart_data->cdns_uart_driver = cdns_uart_uart_driver;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue