From: Aleksey Makarov <aleksey.makarov@linaro.org>
To: linux-acpi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Aleksey Makarov <aleksey.makarov@linaro.org>,
Graeme Gregory <graeme.gregory@linaro.org>,
Russell King <linux@arm.linux.org.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Shannon Zhao <shannon.zhao@linaro.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Vladimir Zapolskiy <vz@mleia.com>, Jiri Slaby <jslaby@suse.com>
Subject: [PATCH v4 3/3] serial: amba-pl011: add ACPI support to AMBA probe
Date: Wed, 23 Dec 2015 17:19:42 +0300 [thread overview]
Message-ID: <1450880383-29560-4-git-send-email-aleksey.makarov@linaro.org> (raw)
In-Reply-To: <1450880383-29560-1-git-send-email-aleksey.makarov@linaro.org>
From: Graeme Gregory <graeme.gregory@linaro.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@linaro.org>
Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.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..974cb9e 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 (has_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
next prev parent reply other threads:[~2015-12-23 14:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-23 14:19 [PATCH v4 0/3] Add AMBA bus probing support to ACPI Aleksey Makarov
2015-12-23 14:19 ` [PATCH v4 1/3] ACPI: amba bus probing support Aleksey Makarov
2015-12-23 18:49 ` Andy Shevchenko
2016-01-03 13:36 ` Russell King - ARM Linux
2015-12-23 14:19 ` [PATCH v4 2/3] ACPI: scan add in amba probing Aleksey Makarov
2015-12-23 14:19 ` Aleksey Makarov [this message]
2016-01-04 23:13 ` [PATCH v4 3/3] serial: amba-pl011: add ACPI support to AMBA probe Timur Tabi
2016-01-05 8:55 ` G Gregory
2016-01-05 16:23 ` Timur Tabi
2016-01-06 11:03 ` Graeme Gregory
2016-01-11 21:38 ` Timur Tabi
2016-01-03 0:39 ` [PATCH v4 0/3] Add AMBA bus probing support to ACPI Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450880383-29560-4-git-send-email-aleksey.makarov@linaro.org \
--to=aleksey.makarov@linaro.org \
--cc=andy.shevchenko@gmail.com \
--cc=graeme.gregory@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rjw@rjwysocki.net \
--cc=shannon.zhao@linaro.org \
--cc=vz@mleia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).