Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752531AbdFLJkV (ORCPT ); Mon, 12 Jun 2017 05:40:21 -0400 Received: from mail-wr0-f181.google.com ([209.85.128.181]:33449 "EHLO mail-wr0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752065AbdFLJkR (ORCPT ); Mon, 12 Jun 2017 05:40:17 -0400 Message-ID: <1497260414.3086.9.camel@baylibre.com> Subject: Re: [PATCH v4 3/7] ARM64: dts: meson-gx: use stable UART bindings with correct gate clock From: Jerome Brunet To: Neil Armstrong , gregkh@linuxfoundation.org, khilman@baylibre.com Cc: Helmut Klein , linux-serial@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Date: Mon, 12 Jun 2017 11:40:14 +0200 In-Reply-To: <1497001756-942-4-git-send-email-narmstrong@baylibre.com> References: <1497001756-942-1-git-send-email-narmstrong@baylibre.com> <1497001756-942-4-git-send-email-narmstrong@baylibre.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6 (3.22.6-2.fc25) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4390 Lines: 153 On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote: > From: Helmut Klein > > This patch switches to the stable UART bindings but also add the correct > gate clock to the non-AO UART nodes for GXBB and GXL SoCs. > > Signed-off-by: Helmut Klein > Signed-off-by: Neil Armstrong Looks Good Acked-by: Jerome Brunet > --- >  arch/arm64/boot/dts/amlogic/meson-gx.dtsi   | 12 +++++------- >  arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++++++++++++++++++++++++ >  arch/arm64/boot/dts/amlogic/meson-gxl.dtsi  | 25 +++++++++++++++++++++++++ >  3 files changed, 55 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > index 436b875..d2b8d52 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > @@ -225,7 +225,7 @@ >   }; >   >   uart_A: serial@84c0 { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart"; >   reg = <0x0 0x84c0 0x0 0x14>; >   interrupts = IRQ_TYPE_EDGE_RISING>; >   clocks = <&xtal>; > @@ -233,7 +233,7 @@ >   }; >   >   uart_B: serial@84dc { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart"; >   reg = <0x0 0x84dc 0x0 0x14>; >   interrupts = IRQ_TYPE_EDGE_RISING>; >   clocks = <&xtal>; > @@ -279,7 +279,7 @@ >   }; >   >   uart_C: serial@8700 { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart"; >   reg = <0x0 0x8700 0x0 0x14>; >   interrupts = IRQ_TYPE_EDGE_RISING>; >   clocks = <&xtal>; > @@ -366,18 +366,16 @@ >   }; >   >   uart_AO: serial@4c0 { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart", > "amlogic,meson-ao-uart"; >   reg = <0x0 0x004c0 0x0 0x14>; >   interrupts = IRQ_TYPE_EDGE_RISING>; > - clocks = <&xtal>; >   status = "disabled"; >   }; >   >   uart_AO_B: serial@4e0 { > - compatible = "amlogic,meson-uart"; > + compatible = "amlogic,meson-gx-uart", > "amlogic,meson-ao-uart"; >   reg = <0x0 0x004e0 0x0 0x14>; >   interrupts = IRQ_TYPE_EDGE_RISING>; > - clocks = <&xtal>; >   status = "disabled"; >   }; >   > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > index dbd300f..1ae8da7 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi > @@ -675,6 +675,31 @@ >   clocks = <&clkc CLKID_SPI>; >  }; >   > +&uart_A { > + clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; > + clock-names = "xtal", "pclk", "baud"; > +}; > + > +&uart_AO { > + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; > + clock-names = "xtal", "pclk", "baud"; > +}; > + > +&uart_AO_B { > + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; > + clock-names = "xtal", "pclk", "baud"; > +}; > + > +&uart_B { > + clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; > + clock-names = "xtal", "core", "baud"; > +}; > + > +&uart_C { > + clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; > + clock-names = "xtal", "core", "baud"; > +}; > + >  &vpu { >   compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; >  }; > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > index 4dfc22b..0c601f8 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > @@ -616,6 +616,31 @@ >   clocks = <&clkc CLKID_SPI>; >  }; >   > +&uart_A { > + clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; > + clock-names = "xtal", "core", "baud"; > +}; > + > +&uart_AO { > + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; > + clock-names = "xtal", "pclk", "baud"; > +}; > + > +&uart_AO_B { > + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&xtal>; > + clock-names = "xtal", "pclk", "baud"; > +}; > + > +&uart_B { > + clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; > + clock-names = "xtal", "core", "baud"; > +}; > + > +&uart_C { > + clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; > + clock-names = "xtal", "core", "baud"; > +}; > + >  &vpu { >   compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; >  };