From: Jim Quinlan <[email protected]>
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 <[email protected]>
Signed-off-by: Florian Fainelli <[email protected]>
Signed-off-by: Al Cooper <[email protected]>
---
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
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 <[email protected]> wrote:
>
> From: Jim Quinlan <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Florian Fainelli <[email protected]>
> Signed-off-by: Al Cooper <[email protected]>
> ---
> 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
>
On 4/23/2021 12:25 PM, Alan Cooper wrote:
> Please ignore this patch, it was already submitted by Florian about an hour ago.
Sorry for the lack of coordination, was about to ask you if you wanted
to send it.
--
Florian