mirror of https://lore.kernel.org/linux-amlogic/
 help / color / mirror / Atom feed
From: yixun.lan@amlogic.com (Yixun Lan)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v2 2/5] ARM64: dts: meson-axg: uart: drop legacy compatible name from EE UART
Date: Sat, 6 Jan 2018 08:10:41 +0800	[thread overview]
Message-ID: <20180106001044.108163-3-yixun.lan@amlogic.com> (raw)
In-Reply-To: <20180106001044.108163-1-yixun.lan@amlogic.com>

When update the clock info for the UART controller in the EE domain,
the driver explicitly require 'pclk' in order to work properly.

With current logic of the code, the driver will go for the legacy clock probe
routine[1] if it find current compatible string match to 'amlogic,meson-uart',
which result in not requesting the 'pclk' clock, thus break the driver in the end.

[1] drivers/tty/serial/meson_uart.c:685

        /* Use legacy way until all platforms switch to new bindings */
	if (of_device_is_compatible(pdev->dev.of_node, "amlogic,meson-uart"))
		ret = meson_uart_probe_clocks_legacy(pdev, port);
	else
		ret = meson_uart_probe_clocks(pdev, port);

Acked-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index 70c776ef7aa7..644d0f9eaf8c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -164,17 +164,21 @@
 			};
 
 			uart_A: serial at 24000 {
-				compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
+				compatible = "amlogic,meson-gx-uart";
 				reg = <0x0 0x24000 0x0 0x18>;
 				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
+				clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
+				clock-names = "xtal", "pclk", "baud";
 			};
 
 			uart_B: serial at 23000 {
-				compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
+				compatible = "amlogic,meson-gx-uart";
 				reg = <0x0 0x23000 0x0 0x18>;
 				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
+				clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
+				clock-names = "xtal", "pclk", "baud";
 			};
 		};
 
-- 
2.15.1

  parent reply	other threads:[~2018-01-06  0:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-06  0:10 [PATCH v2 0/5] ARM64: dts: meson-axg: UART DT updates Yixun Lan
2018-01-06  0:10 ` [PATCH v2 1/5] ARM64: dts: meson: uart: fix address space range Yixun Lan
2018-01-08  8:54   ` Jerome Brunet
2018-01-06  0:10 ` Yixun Lan [this message]
2018-01-08  8:56   ` [PATCH v2 2/5] ARM64: dts: meson-axg: uart: drop legacy compatible name from EE UART Jerome Brunet
2018-01-06  0:10 ` [PATCH v2 3/5] ARM64: dts: meson-axg: uart: Add the pinctrl info description Yixun Lan
2018-01-07 20:19   ` Martin Blumenstingl
2018-01-08  6:07     ` Yixun Lan
2018-01-08  6:44       ` Yixun Lan
2018-01-08  8:42       ` Jerome Brunet
2018-01-06  0:10 ` [PATCH v2 4/5] ARM64: dts: meson-axg: complete the pinctrl info for UART_AO_A Yixun Lan
2018-01-06  0:10 ` [PATCH v2 5/5] ARM64: dts: meson-axg: enable the UART_A controller Yixun Lan

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=20180106001044.108163-3-yixun.lan@amlogic.com \
    --to=yixun.lan@amlogic.com \
    --cc=linus-amlogic@lists.infradead.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

all inboxes | Powered by JetHome®