On 01/27/2015 09:30 AM, Rob Herring wrote: > On Tue, Jan 27, 2015 at 6:44 AM, Peter Hurley <peter@xxxxxxxxxxxxxxxxxx> wrote: >> Hi Rob, >> >> On 01/26/2015 11:50 PM, Rob Herring wrote: >>> Add mrvl,pxa-uart and mrvl,mmp-uart compatible strings for the of_serial >>> driver. These are 8250 variants which have a port type of PORT_XSCALE. >>> >>> There is also the serial driver pxa.c with these compatible strings >>> already. However, it can be replaced with the common 8250 driver. It has >>> some issues like it cannot coexist with the 8250 driver due to tty name >>> collision. That also means adding these compatible strings here should >>> not case a problem. >> >> So what determines which driver is controlling the port if both >> drivers are built-in? > > If both are built-in, whoever registers ttyS ports first wins. This > will be the 8250 driver due to link order. Ok, but then I think the commit log should reflect that this patch effectively replaces pxa2xx-uart driver with the 8250 driver for PXA/MMP uarts if both drivers are built-in or both drivers are modules. > So I guess PXA systems have avoided this by never building in 8250 driver. Platform devices are initialized first, so before this patch the pxa2xx-uart driver would have claimed the platform ports before the 8250 driver, if both were built-in (or both modules). Maybe Kconfig should warn if they're both built-in or both modules? Regards, Peter Hurley >>> Signed-off-by: Rob Herring <robh@xxxxxxxxxx> >>> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> >>> Cc: Jiri Slaby <jslaby@xxxxxxx> >>> Cc: linux-serial@xxxxxxxxxxxxxxx >>> --- >>> drivers/tty/serial/of_serial.c | 4 ++++ >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c >>> index 3194b42..fbb719c 100644 >>> --- a/drivers/tty/serial/of_serial.c >>> +++ b/drivers/tty/serial/of_serial.c >>> @@ -335,6 +335,10 @@ static struct of_device_id of_platform_serial_table[] = { >>> .data = (void *)PORT_ALTR_16550_F64, }, >>> { .compatible = "altr,16550-FIFO128", >>> .data = (void *)PORT_ALTR_16550_F128, }, >>> + { .compatible = "mrvl,mmp-uart", >>> + .data = (void *)PORT_XSCALE, }, >>> + { .compatible = "mrvl,pxa-uart", >>> + .data = (void *)PORT_XSCALE, }, >>> #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL >>> { .compatible = "ibm,qpace-nwp-serial", >>> .data = (void *)PORT_NWPSERIAL, }, >>> >> -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html