From: gregory.clement@free-electrons•com (Gregory CLEMENT)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 12/16] serial: mvebu-uart: support extended port registers layout
Date: Fri, 06 Oct 2017 14:46:43 +0200 [thread overview]
Message-ID: <87wp48e958.fsf@free-electrons.com> (raw)
In-Reply-To: <20171006101344.15590-13-miquel.raynal@free-electrons.com> (Miquel Raynal's message of "Fri, 6 Oct 2017 12:13:40 +0200")
Hi Miquel,
On ven., oct. 06 2017, Miquel Raynal <miquel.raynal@free-electrons•com> wrote:
> Define the missing register offsets and bit fields for the extended
> UART port. Add a second driver data structure filled with its port data,
> selected with the right compatible (marvell,armada-3700-uart-ext).
>
> Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons•com>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons•com>
Thanks,
Gregory
> ---
> drivers/tty/serial/mvebu-uart.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c
> index 3e46affa09a8..38b067e0ef0c 100644
> --- a/drivers/tty/serial/mvebu-uart.c
> +++ b/drivers/tty/serial/mvebu-uart.c
> @@ -39,10 +39,13 @@
>
> /* Register Map */
> #define UART_STD_RBR 0x00
> +#define UART_EXT_RBR 0x18
>
> #define UART_STD_TSH 0x04
> +#define UART_EXT_TSH 0x1C
>
> #define UART_STD_CTRL1 0x08
> +#define UART_EXT_CTRL1 0x04
> #define CTRL_SOFT_RST BIT(31)
> #define CTRL_TXFIFO_RST BIT(15)
> #define CTRL_RXFIFO_RST BIT(14)
> @@ -55,15 +58,20 @@
> CTRL_PAR_ERR_INT | CTRL_OVR_ERR_INT)
>
> #define UART_STD_CTRL2 UART_STD_CTRL1
> +#define UART_EXT_CTRL2 0x20
> #define CTRL_STD_TX_RDY_INT BIT(5)
> +#define CTRL_EXT_TX_RDY_INT BIT(6)
> #define CTRL_STD_RX_RDY_INT BIT(4)
> +#define CTRL_EXT_RX_RDY_INT BIT(5)
>
> #define UART_STAT 0x0C
> #define STAT_TX_FIFO_EMP BIT(13)
> #define STAT_TX_FIFO_FUL BIT(11)
> #define STAT_TX_EMP BIT(6)
> #define STAT_STD_TX_RDY BIT(5)
> +#define STAT_EXT_TX_RDY BIT(15)
> #define STAT_STD_RX_RDY BIT(4)
> +#define STAT_EXT_RX_RDY BIT(14)
> #define STAT_BRK_DET BIT(3)
> #define STAT_FRM_ERR BIT(2)
> #define STAT_PAR_ERR BIT(1)
> @@ -858,12 +866,28 @@ static struct mvebu_uart_driver_data uart_std_driver_data = {
> .flags.stat_rx_rdy = STAT_STD_RX_RDY,
> };
>
> +static struct mvebu_uart_driver_data uart_ext_driver_data = {
> + .is_ext = true,
> + .regs.rbr = UART_EXT_RBR,
> + .regs.tsh = UART_EXT_TSH,
> + .regs.ctrl = UART_EXT_CTRL1,
> + .regs.intr = UART_EXT_CTRL2,
> + .flags.ctrl_tx_rdy_int = CTRL_EXT_TX_RDY_INT,
> + .flags.ctrl_rx_rdy_int = CTRL_EXT_RX_RDY_INT,
> + .flags.stat_tx_rdy = STAT_EXT_TX_RDY,
> + .flags.stat_rx_rdy = STAT_EXT_RX_RDY,
> +};
> +
> /* Match table for of_platform binding */
> static const struct of_device_id mvebu_uart_of_match[] = {
> {
> .compatible = "marvell,armada-3700-uart",
> .data = (void *)&uart_std_driver_data,
> },
> + {
> + .compatible = "marvell,armada-3700-uart-ext",
> + .data = (void *)&uart_ext_driver_data,
> + },
> {}
> };
>
> --
> 2.11.0
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2017-10-06 12:46 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-06 10:13 [PATCH 00/16] Support armada-37xx second UART port Miquel Raynal
2017-10-06 10:13 ` [PATCH 01/16] dt-bindings: mvebu-uart: update documentation with extended UART Miquel Raynal
2017-10-06 12:17 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 02/16] pinctrl: dt-bindings: Fix A37xx uart2 group name Miquel Raynal
2017-10-06 12:18 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 03/16] serial: mvebu-uart: use driver name when requesting an interrupt Miquel Raynal
2017-10-06 12:19 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 04/16] serial: mvebu-uart: support probe of multiple ports Miquel Raynal
2017-10-06 12:23 ` Gregory CLEMENT
2017-10-09 7:17 ` Miquel RAYNAL
2017-10-12 12:22 ` Gregory CLEMENT
2017-10-13 7:29 ` Miquel RAYNAL
2017-10-06 10:13 ` [PATCH 05/16] serial: mvebu-uart: use a generic way to access the registers Miquel Raynal
2017-10-06 12:32 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 06/16] serial: mvebu-uart: add soft reset at probe Miquel Raynal
2017-10-06 12:33 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 07/16] serial: mvebu-uart: add function to change baudrate Miquel Raynal
2017-10-06 12:39 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 08/16] serial: mvebu-uart: clear state register before IRQ request Miquel Raynal
2017-10-06 12:40 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 09/16] serial: mvebu-uart: add TX interrupt trigger for pulse interrupts Miquel Raynal
2017-10-06 20:22 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 10/16] serial: mvebu-uart: dissociate RX and TX interrupts Miquel Raynal
2017-10-06 13:11 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 11/16] serial: mvebu-uart: augment the maximum number of ports Miquel Raynal
2017-10-06 12:45 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 12/16] serial: mvebu-uart: support extended port registers layout Miquel Raynal
2017-10-06 12:46 ` Gregory CLEMENT [this message]
2017-10-06 10:13 ` [PATCH 13/16] arm64: dts: marvell: armada-37xx: add UART clock Miquel Raynal
2017-10-06 12:48 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 14/16] arm64: dts: marvell: armada-37xx: add second UART port Miquel Raynal
2017-10-06 12:49 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 15/16] arm64: dts: marvell: armada-3720-db: enable " Miquel Raynal
2017-10-06 12:51 ` Gregory CLEMENT
2017-10-06 10:13 ` [PATCH 16/16] arm64: dts: marvell: armada-3720-espressobin: fill UART nodes Miquel Raynal
2017-10-06 13:01 ` Gregory CLEMENT
2017-10-06 13:15 ` Thomas Petazzoni
2017-10-09 7:30 ` Miquel RAYNAL
2017-10-12 11:24 ` Gregory CLEMENT
2017-10-13 7:01 ` Miquel RAYNAL
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=87wp48e958.fsf@free-electrons.com \
--to=gregory.clement@free-electrons$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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