Please ignore this patch, it was already submitted by Florian about an hour ago. Thanks Al On Fri, Apr 23, 2021 at 3:20 PM Al Cooper <alcooperx@xxxxxxxxx> wrote: > > From: Jim Quinlan <jim2101024@xxxxxxxxx> > > This commit has of_platform_serial_probe() check specifically for the > "brcm,bcm7271-uart" and whether its companion driver is enabled. If it > is the case, and the clock provider is not ready, we want to make sure > that when the 8250_bcm7271.c driver returns EPROBE_DEFER, we are not > getting the UART registered via 8250_of.c. > > Signed-off-by: Jim Quinlan <jim2101024@xxxxxxxxx> > Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx> > Signed-off-by: Al Cooper <alcooperx@xxxxxxxxx> > --- > drivers/tty/serial/8250/8250_of.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c > index 65e9045dafe6..aa458f3c6644 100644 > --- a/drivers/tty/serial/8250/8250_of.c > +++ b/drivers/tty/serial/8250/8250_of.c > @@ -192,6 +192,10 @@ static int of_platform_serial_probe(struct platform_device *ofdev) > u32 tx_threshold; > int ret; > > + if (IS_ENABLED(CONFIG_SERIAL_8250_BCM7271) && > + of_device_is_compatible(ofdev->dev.of_node, "brcm,bcm7271-uart")) > + return -ENODEV; > + > port_type = (unsigned long)of_device_get_match_data(&ofdev->dev); > if (port_type == PORT_UNKNOWN) > return -EINVAL; > -- > 2.17.1 >
