serial: samsung: Consider DT alias when probing ports (13a9f6c6) · Commits · 戴 / test

Current driver code relies on probe order of particular samsung-uart instances, which makes it impossible to get proper initialization of ports when not all ports are available on board, not even saying of deterministic device naming. This patch fixes this on DT-enabled systems by using DT aliases for ports as instance ID, if specified, or falling back to legacy method otherwise to provide backwards compatibility. Signed-off-by:

Tomasz Figa <t.figa@samsung.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/tty/serial/samsung.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -1275,11 +1275,18 @@ static inline struct s3c24xx_serial_drv_data *s3c24xx_get_driver_data(
		static int s3c24xx_serial_probe(struct platform_device *pdev)
		{
		struct s3c24xx_uart_port *ourport;
		int index = probe_index;
		int ret;

		dbg("s3c24xx_serial_probe(%p) %d\n", pdev, probe_index);
		if (pdev->dev.of_node) {
		ret = of_alias_get_id(pdev->dev.of_node, "serial");
		if (ret >= 0)
		index = ret;
		}

		dbg("s3c24xx_serial_probe(%p) %d\n", pdev, index);

		ourport = &s3c24xx_serial_ports[probe_index];
		ourport = &s3c24xx_serial_ports[index];

		ourport->drv_data = s3c24xx_get_driver_data(pdev);
		if (!ourport->drv_data) {
		@@ -1295,7 +1302,7 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)

		ourport->port.fifosize = (ourport->info->fifosize) ?
		ourport->info->fifosize :
		ourport->drv_data->fifosize[probe_index];
		ourport->drv_data->fifosize[index];

		probe_index++;

Admin message