On Wed, Sep 30, 2015 at 5:38 AM, Graeme Gregory
<graeme.gregory@xxxxxxxxxx> wrote:
> @@ -2368,18 +2368,28 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
> if (!uap)
> return -ENOMEM;
>
> - uap->clk = devm_clk_get(&dev->dev, NULL);
> - if (IS_ERR(uap->clk))
> - return PTR_ERR(uap->clk);
> -
> - uap->vendor = vendor;
> - uap->lcrh_rx = vendor->lcrh_rx;
> - uap->lcrh_tx = vendor->lcrh_tx;
> - uap->fifosize = vendor->get_fifosize(dev);
> + /* ACPI only defines SBSA variant */
> + if (!ACPI_COMPANION(&dev->dev)) {
> + uap->clk = devm_clk_get(&dev->dev, NULL);
> + if (IS_ERR(uap->clk))
> + return PTR_ERR(uap->clk);
> +
> + uap->vendor = vendor;
> + uap->lcrh_rx = vendor->lcrh_rx;
> + uap->lcrh_tx = vendor->lcrh_tx;
> + uap->fifosize = vendor->get_fifosize(dev);
> + uap->port.ops = &amba_pl011_pops;
> + snprintf(uap->type, sizeof(uap->type), "PL011 rev%u",
> + amba_rev(dev));
> + } else {
> + uap->vendor = &vendor_sbsa;
> + uap->fifosize = 32;
> + uap->port.ops = &sbsa_uart_pops;
> + uap->fixed_baud = 115200;
> +
> + snprintf(uap->type, sizeof(uap->type), "SBSA");
> + }
> uap->port.irq = dev->irq[0];
> - uap->port.ops = &amba_pl011_pops;
> -
> - snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev));
I'm confused. We already have ACPI support in amba-pl011 driver, and
pl011_probe() is never called on an SBSA system. That's what
sbsa_uart_probe() is for. You even added this patch:
drivers: PL011: add ACPI probing for SBSA UART
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
--
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
