]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: of-serial: Remove device_type = "serial" registration
authorMichal Simek <michal.simek@xilinx.com>
Tue, 14 Apr 2015 10:03:09 +0000 (12:03 +0200)
committerJiri Slaby <jslaby@suse.cz>
Fri, 15 May 2015 07:10:47 +0000 (09:10 +0200)
commit 6befa9d883385c580369a2cc9e53fbf329771f6d upstream.

Do not probe all serial drivers by of_serial.c which are using
device_type = "serial"; property. Only drivers which have valid
compatible strings listed in the driver should be probed.

When PORT_UNKNOWN is setup probe will fail anyway.

Arnd quotation about driver historical background:
"when I wrote that driver initially, the idea was that it would
get used as a stub to hook up all other serial drivers but after
that, the common code learned to create platform devices from DT"

This patch fix the problem with on the system with xilinx_uartps and
16550a where of_serial failed to register for xilinx_uartps and because
of irq_dispose_mapping() removed irq_desc. Then when xilinx_uartps was asking
for irq with request_irq() EINVAL is returned.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/tty/serial/of_serial.c

index 2caf9c6f61499f15738a29c6659d91f1c7fad826..d666517288aa2428b6e99d0f5cc25eafe993c43f 100644 (file)
@@ -262,7 +262,6 @@ static struct of_device_id of_platform_serial_table[] = {
        { .compatible = "ibm,qpace-nwp-serial",
                .data = (void *)PORT_NWPSERIAL, },
 #endif
-       { .type = "serial",         .data = (void *)PORT_UNKNOWN, },
        { /* end of list */ },
 };