devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Cernekee <cernekee@gmail.com>
To: gregkh@linuxfoundation.org, jslaby@suse.cz, robh@kernel.org
Cc: arnd@arndb.de, daniel@zonque.org, haojian.zhuang@gmail.com,
	robert.jarzmik@free.fr, grant.likely@linaro.org,
	f.fainelli@gmail.com, mbizon@freebox.fr, jogo@openwrt.org,
	linux-mips@linux-mips.org, linux-serial@vger.kernel.org,
	devicetree@vger.kernel.org
Subject: [PATCH V2 06/10] serial: pxa: Add fifo-size and {big,native}-endian properties
Date: Wed, 12 Nov 2014 12:54:03 -0800	[thread overview]
Message-ID: <1415825647-6024-7-git-send-email-cernekee@gmail.com> (raw)
In-Reply-To: <1415825647-6024-1-git-send-email-cernekee@gmail.com>

With a few tweaks, the PXA serial driver can handle other 16550A clones.
Add a fifo-size DT property to override the FIFO depth (BCM7xxx uses 32),
and {native,big}-endian properties similar to regmap to support SoCs that
have BE or "automagic endian" registers.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---
 drivers/tty/serial/pxa.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 21b7d8b..21406dc 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -60,13 +60,19 @@ struct uart_pxa_port {
 static inline unsigned int serial_in(struct uart_pxa_port *up, int offset)
 {
 	offset <<= 2;
-	return readl(up->port.membase + offset);
+	if (up->port.iotype == UPIO_MEM32BE)
+		return ioread32be(up->port.membase + offset);
+	else
+		return readl(up->port.membase + offset);
 }
 
 static inline void serial_out(struct uart_pxa_port *up, int offset, int value)
 {
 	offset <<= 2;
-	writel(value, up->port.membase + offset);
+	if (up->port.iotype == UPIO_MEM32BE)
+		iowrite32be(value, up->port.membase + offset);
+	else
+		writel(value, up->port.membase + offset);
 }
 
 static void serial_pxa_enable_ms(struct uart_port *port)
@@ -833,6 +839,7 @@ static int serial_pxa_probe_dt(struct platform_device *pdev,
 {
 	struct device_node *np = pdev->dev.of_node;
 	int ret;
+	u32 val;
 
 	if (!np)
 		return 1;
@@ -843,6 +850,13 @@ static int serial_pxa_probe_dt(struct platform_device *pdev,
 		return ret;
 	}
 	sport->port.line = ret;
+
+	if (of_property_read_u32(np, "fifo-size", &val) == 0)
+		sport->port.fifosize = val;
+
+	sport->port.iotype =
+		of_device_is_big_endian(np) ? UPIO_MEM32BE : UPIO_MEM32;
+
 	return 0;
 }
 
-- 
2.1.1


  parent reply	other threads:[~2014-11-12 20:54 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-12 20:53 [PATCH V2 00/10] UART driver support for BMIPS multiplatform kernels Kevin Cernekee
2014-11-12 20:53 ` [PATCH V2 01/10] tty: Fallback to use dynamic major number Kevin Cernekee
2014-11-25 20:34   ` Greg KH
2014-11-25 23:37     ` Kevin Cernekee
2014-11-25 23:49       ` Greg KH
2014-11-26 13:33       ` Grant Likely
2014-11-26 14:34         ` Peter Hurley
2014-11-27 11:10           ` Geert Uytterhoeven
2014-11-27 13:50           ` Grant Likely
2014-11-27 14:33             ` Arnd Bergmann
2014-11-12 20:53 ` [PATCH V2 02/10] serial: core: Add big-endian iotype Kevin Cernekee
2014-11-12 20:54 ` [PATCH V2 03/10] of: Fix of_device_is_compatible() comment Kevin Cernekee
2014-11-18 17:32   ` Grant Likely
2014-11-12 20:54 ` [PATCH V2 04/10] of: Change of_device_is_available() to return bool Kevin Cernekee
2014-11-18 17:33   ` Grant Likely
2014-11-12 20:54 ` [PATCH V2 05/10] of: Add helper function to check MMIO register endianness Kevin Cernekee
2014-11-18 21:47   ` Grant Likely
2014-11-12 20:54 ` Kevin Cernekee [this message]
2014-11-19 14:49   ` [PATCH V2 06/10] serial: pxa: Add fifo-size and {big,native}-endian properties Grant Likely
2014-11-19 16:23     ` Kevin Cernekee
2014-11-12 20:54 ` [PATCH V2 07/10] serial: pxa: Make the driver buildable for BCM7xxx set-top platforms Kevin Cernekee
2014-11-12 20:54 ` [PATCH V2 08/10] serial: pxa: Update DT binding documentation Kevin Cernekee
2014-11-12 20:54 ` [PATCH V2 09/10] serial: earlycon: Set UPIO_MEM32BE based on DT properties Kevin Cernekee
2014-11-18 21:50   ` Grant Likely
2014-11-19  3:16   ` Rob Herring
2014-11-19 14:43     ` Grant Likely
2014-11-12 20:54 ` [PATCH V2 10/10] serial: pxa: Add OF_EARLYCON support Kevin Cernekee
     [not found] ` <1415825647-6024-1-git-send-email-cernekee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-11-13  7:36   ` [PATCH V2 00/10] UART driver support for BMIPS multiplatform kernels Robert Jarzmik
2014-11-13 16:39     ` Kevin Cernekee

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=1415825647-6024-7-git-send-email-cernekee@gmail.com \
    --to=cernekee@gmail.com \
    --cc=arnd@arndb.de \
    --cc=daniel@zonque.org \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=grant.likely@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=haojian.zhuang@gmail.com \
    --cc=jogo@openwrt.org \
    --cc=jslaby@suse.cz \
    --cc=linux-mips@linux-mips.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=mbizon@freebox.fr \
    --cc=robert.jarzmik@free.fr \
    --cc=robh@kernel.org \
    /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).