From mboxrd@z Thu Jan  1 00:00:00 1970
From: jbrunet@baylibre.com (Jerome Brunet)
Date: Mon, 12 Jun 2017 11:47:59 +0200
Subject: [PATCH v4 7/7] ARM: dts: meson8b: switch to new bindings for
 UART nodes
In-Reply-To: <1497001756-942-8-git-send-email-narmstrong@baylibre.com>
References: <1497001756-942-1-git-send-email-narmstrong@baylibre.com>
 <1497001756-942-8-git-send-email-narmstrong@baylibre.com>
Message-ID: <1497260879.3086.13.camel@baylibre.com>
To: linus-amlogic@lists.infradead.org
List-Id: linus-amlogic.lists.infradead.org

On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote:
> Switch to the stable UART bindings by adding a XTAL node and using the
> proper compatible strings.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> ?arch/arm/boot/dts/meson8b.dtsi | 23 +++++++++++++++++++----
> ?1 file changed, 19 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
> index d9f116a..651ad4a 100644
> --- a/arch/arm/boot/dts/meson8b.dtsi
> +++ b/arch/arm/boot/dts/meson8b.dtsi
> @@ -82,6 +82,13 @@
> ?			reg = <0x203>;
> ?		};
> ?	};
> +
> +	xtal: xtal-clk {
> +		compatible = "fixed-clock";
> +		clock-frequency = <24000000>;
> +		clock-output-names = "xtal";
> +		#clock-cells = <0>;
> +	};

On meson8b, I think xtal is already provided by <&clkc CLKID_XTAL>.
We have to choose which one we want.

With this handled:

Acked-by: Jerome Brunet <jbrunet@baylibre.com>

> ?}; /* end of / */
> ?
> ?&aobus {
> @@ -178,17 +185,25 @@
> ?};
> ?
> ?&uart_AO {
> -	clocks = <&clkc CLKID_CLK81>;
> +	compatible = "amlogic,meson8b-uart", "amlogic,meson-ao-uart";
> +	clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
> +	clock-names = "xtal", "pclk", "baud";
> ?};
> ?
> ?&uart_A {
> -	clocks = <&clkc CLKID_CLK81>;
> +	compatible = "amlogic,meson8b-uart";
> +	clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
> +	clock-names = "xtal", "pclk", "baud";
> ?};
> ?
> ?&uart_B {
> -	clocks = <&clkc CLKID_CLK81>;
> +	compatible = "amlogic,meson8b-uart";
> +	clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
> +	clock-names = "xtal", "pclk", "baud";
> ?};
> ?
> ?&uart_C {
> -	clocks = <&clkc CLKID_CLK81>;
> +	compatible = "amlogic,meson8b-uart";
> +	clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
> +	clock-names = "xtal", "pclk", "baud";
> ?};