lkml.org 
[lkml]   [2015]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH 3/3] serial: amba-pl011: add ACPI support to AMBA probe
    From
    On Wed, Sep 30, 2015 at 5:38 AM, Graeme Gregory
    <graeme.gregory@linaro.org> 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.


    \
     
     \ /
      Last update: 2015-12-03 21:21    [W:3.412 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site