[PATCH 0/2] serial: 8250_omap: Add compatible for AM654 UART

[PATCH 0/2] serial: 8250_omap: Add compatible for AM654 UART

[Nishanth Menon]

Hi,

This series was previously send out as part of a larger AM654 UART
support series, but was determined to create a bit of merge conflicts
due to interdependence.

Changes since RFC are indicated in corresponding patches in the series

Instead this series is split out. The series itself is based off
v4.18-rc1 and available here:
https://github.com/nmenon/linux-2.6-playground/commits/upstream/v4.18-rc1/k3-1-am6-uart

Consolidated all patches (including all series) are available here:
https://github.com/nmenon/linux-2.6-playground/commits/upstream/v4.18-rc1/k3-am6-integ

Full Boot log (integrated of all series) is available here:
   https://pastebin.ubuntu.com/p/bBFmnzYtCd/

Nishanth Menon (2):
  dt-bindings: serial: 8250_omap: Add compatible for AM654 UART
    controller
  serial: 8250_omap: Add support for AM654 UART controller

 Documentation/devicetree/bindings/serial/omap_serial.txt | 1 +
 drivers/tty/serial/8250/8250_omap.c                      | 1 +
 2 files changed, 2 insertions(+)

-- 
2.15.1

[PATCH 1/2] dt-bindings: serial: 8250_omap: Add compatible for AM654 UART controller

[Nishanth Menon]

AM654 uses a UART controller that is only partially compatible with
existing 8250 UART. UART DMA integration is substantially different
and even a match against standard 8250 or omap4 would result in
non-working UART once DMA is enabled by default.

Introduce a specific compatible to help build up the differences in
follow on patches.

Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Vignesh R <vigneshr@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---

Changes since RFC:
* DT binding has been split out as it's own patch and commit message elaborated

RFC: https://patchwork.kernel.org/patch/10447641/

 Documentation/devicetree/bindings/serial/omap_serial.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/serial/omap_serial.txt b/Documentation/devicetree/bindings/serial/omap_serial.txt
index 4b0f05adb228..c35d5ece1156 100644
--- a/Documentation/devicetree/bindings/serial/omap_serial.txt
+++ b/Documentation/devicetree/bindings/serial/omap_serial.txt
@@ -1,6 +1,7 @@
 OMAP UART controller
 
 Required properties:
+- compatible : should be "ti,am654-uart" for AM654 controllers
 - compatible : should be "ti,omap2-uart" for OMAP2 controllers
 - compatible : should be "ti,omap3-uart" for OMAP3 controllers
 - compatible : should be "ti,omap4-uart" for OMAP4 controllers
-- 
2.15.1

Re: [PATCH 1/2] dt-bindings: serial: 8250_omap: Add compatible for AM654 UART controller

[Rob Herring]

On Tue, Jun 19, 2018 at 02:44:49PM -0500, Nishanth Menon wrote:
> AM654 uses a UART controller that is only partially compatible with
> existing 8250 UART. UART DMA integration is substantially different
> and even a match against standard 8250 or omap4 would result in
> non-working UART once DMA is enabled by default.
> 
> Introduce a specific compatible to help build up the differences in
> follow on patches.
> 
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Vignesh R <vigneshr@ti.com>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---

Acked-by: Rob Herring <robh@kernel.org>

[PATCH 2/2] serial: 8250_omap: Add support for AM654 UART controller

[Nishanth Menon]

AM654 uses a UART controller that is compatible (partially) with
existing 8250 UART, however, has a few differences with respect to DMA
support and control paths. Introduce a base definition that allows us
to build up the differences in follow on patches.

Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Vignesh R <vigneshr@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---

Changes since RFC: Driver change has been split out with corresponding description.

RFC: https://patchwork.kernel.org/patch/10447641/

 drivers/tty/serial/8250/8250_omap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index 1b337fee07ed..a019286f8bb6 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -1115,6 +1115,7 @@ static const u8 am3352_habit = OMAP_DMA_TX_KICK | UART_ERRATA_CLOCK_DISABLE;
 static const u8 dra742_habit = UART_ERRATA_CLOCK_DISABLE;
 
 static const struct of_device_id omap8250_dt_ids[] = {
+	{ .compatible = "ti,am654-uart" },
 	{ .compatible = "ti,omap2-uart" },
 	{ .compatible = "ti,omap3-uart" },
 	{ .compatible = "ti,omap4-uart", .data = &omap4_habit, },
-- 
2.15.1

Re: [PATCH 0/2] serial: 8250_omap: Add compatible for AM654 UART

[Tony Lindgren]

* Nishanth Menon <nm@ti.com> [180619 20:13]:
> Hi,
> 
> This series was previously send out as part of a larger AM654 UART
> support series, but was determined to create a bit of merge conflicts
> due to interdependence.

Both patches look good to me:

Acked-by: Tony Lindgren <tony@atomide.com>