[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1450716100-13688-4-git-send-email-aleksey.makarov@linaro.org>
Date: Mon, 21 Dec 2015 19:41:38 +0300
From: Aleksey Makarov <aleksey.makarov@...aro.org>
To: linux-acpi@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, linux-serial@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
Aleksey Makarov <aleksey.makarov@...aro.org>,
Graeme Gregory <graeme.gregory@...aro.org>,
Russell King <linux@....linux.org.uk>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Rafael J . Wysocki" <rjw@...ysocki.net>,
Shannon Zhao <shannon.zhao@...aro.org>,
Jiri Slaby <jslaby@...e.com>
Subject: [PATCH v3 3/3] serial: amba-pl011: add ACPI support to AMBA probe
From: Graeme Gregory <graeme.gregory@...aro.org>
In ACPI this device is only defined in SBSA mode so
if we are coming from ACPI use this mode.
Signed-off-by: Graeme Gregory <graeme.gregory@...aro.org>
Signed-off-by: Aleksey Makarov <aleksey.makarov@...aro.org>
---
drivers/tty/serial/amba-pl011.c | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 899a771..766ce4f 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2368,18 +2368,33 @@ 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);
- uap->port.irq = dev->irq[0];
- uap->port.ops = &amba_pl011_pops;
+ /* ACPI only defines SBSA variant */
+ if (ACPI_COMPANION(&dev->dev)) {
+ /*
+ * According to ARM ARMH0011 is currently the only mapping
+ * of pl011 in ACPI and it's mapped to SBSA UART mode
+ */
+ uap->vendor = &vendor_sbsa;
+ uap->fifosize = 32;
+ uap->port.ops = &sbsa_uart_pops;
+ uap->fixed_baud = 115200;
- snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev));
+ snprintf(uap->type, sizeof(uap->type), "SBSA");
+ } else {
+ 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));
+ }
+ uap->port.irq = dev->irq[0];
ret = pl011_setup_port(&dev->dev, uap, &dev->res, portnr);
if (ret)
--
2.6.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists