[PATCH 0/2] add Meson8/Meson8b serial core clock handling

[PATCH 0/2] add Meson8/Meson8b serial core clock handling

[Martin Blumenstingl]

This patchset adds the tty/serial core clock handling to the UARTs
on Meson8 and Meson8b.

Basically this is the Meson8 and Meson8b version of a patchset from
Helmut Klein and Neil Armstrong, who implemented this for Meson GX
(see [0]). Back then I asked Neil to drop Meson8b from his patchset
because I was working on the Meson8 clock controller at that time.

This also removes the last users that rely on the "amlogic,meson-uart"
binding. Removing that binding from the meson_uart driver is not part
of this series though.


[0] http://lists.infradead.org/pipermail/linux-amlogic/2017-June/004173.html

Martin Blumenstingl (2):
  ARM: dts: meson8: use stable UART bindings with correct gate clock
  ARM: dts: meson8b: use stable UART bindings with correct gate clock

 arch/arm/boot/dts/meson8.dtsi  | 16 ++++++++++++----
 arch/arm/boot/dts/meson8b.dtsi | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

-- 
2.14.3

[PATCH 1/2] ARM: dts: meson8: use stable UART bindings with correct gate clock

[Martin Blumenstingl]

Switch to the stable UART bindings and add the correct gate clocks
to the non-AO UART nodes.
This fixes the non-AO UARTs if the bootloader didn't un-gate the clocks.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 arch/arm/boot/dts/meson8.dtsi | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index 661287806ead..eb3f8161eef0 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -337,19 +337,27 @@
 };
 
 &uart_AO {
-	clocks = <&clkc CLKID_CLK81>;
+	compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
+	clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
+	clock-names = "xtal", "pclk", "baud";
 };
 
 &uart_A {
-	clocks = <&clkc CLKID_CLK81>;
+	compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
+	clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
+	clock-names = "xtal", "pclk", "baud";
 };
 
 &uart_B {
-	clocks = <&clkc CLKID_CLK81>;
+	compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
+	clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>;
+	clock-names = "xtal", "pclk", "baud";
 };
 
 &uart_C {
-	clocks = <&clkc CLKID_CLK81>;
+	compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
+	clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
+	clock-names = "xtal", "pclk", "baud";
 };
 
 &usb0 {
-- 
2.14.3

[PATCH 2/2] ARM: dts: meson8b: use stable UART bindings with correct gate clock

[Martin Blumenstingl]

Switch to the stable UART bindings and add the correct gate clocks
to the non-AO UART nodes.
This fixes the non-AO UARTs if the bootloader didn't un-gate the clocks.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 arch/arm/boot/dts/meson8b.dtsi | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index 15ed84441d8d..070a28ec293f 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -242,19 +242,27 @@
 };
 
 &uart_AO {
-	clocks = <&clkc CLKID_CLK81>;
+	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
+	clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
+	clock-names = "xtal", "pclk", "baud";
 };
 
 &uart_A {
-	clocks = <&clkc CLKID_CLK81>;
+	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
+	clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
+	clock-names = "xtal", "pclk", "baud";
 };
 
 &uart_B {
-	clocks = <&clkc CLKID_CLK81>;
+	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
+	clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>;
+	clock-names = "xtal", "pclk", "baud";
 };
 
 &uart_C {
-	clocks = <&clkc CLKID_CLK81>;
+	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
+	clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
+	clock-names = "xtal", "pclk", "baud";
 };
 
 &usb0 {
-- 
2.14.3

[PATCH 0/2] add Meson8/Meson8b serial core clock handling

[Jerome Brunet]

On Sat, 2017-10-28 at 14:34 +0200, Martin Blumenstingl wrote:
> This patchset adds the tty/serial core clock handling to the UARTs
> on Meson8 and Meson8b.
> 
> Basically this is the Meson8 and Meson8b version of a patchset from
> Helmut Klein and Neil Armstrong, who implemented this for Meson GX
> (see [0]). Back then I asked Neil to drop Meson8b from his patchset
> because I was working on the Meson8 clock controller at that time.
> 
> This also removes the last users that rely on the "amlogic,meson-uart"
> binding. Removing that binding from the meson_uart driver is not part
> of this series though.
> 
> 
> [0] http://lists.infradead.org/pipermail/linux-amlogic/2017-June/004173.html
> 

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

> Martin Blumenstingl (2):
>   ARM: dts: meson8: use stable UART bindings with correct gate clock
>   ARM: dts: meson8b: use stable UART bindings with correct gate clock
> 
>  arch/arm/boot/dts/meson8.dtsi  | 16 ++++++++++++----
>  arch/arm/boot/dts/meson8b.dtsi | 16 ++++++++++++----
>  2 files changed, 24 insertions(+), 8 deletions(-)
> 

[PATCH 0/2] add Meson8/Meson8b serial core clock handling

[Kevin Hilman]

Jerome Brunet <jbrunet@baylibre.com> writes:

> On Sat, 2017-10-28 at 14:34 +0200, Martin Blumenstingl wrote:
>> This patchset adds the tty/serial core clock handling to the UARTs
>> on Meson8 and Meson8b.
>> 
>> Basically this is the Meson8 and Meson8b version of a patchset from
>> Helmut Klein and Neil Armstrong, who implemented this for Meson GX
>> (see [0]). Back then I asked Neil to drop Meson8b from his patchset
>> because I was working on the Meson8 clock controller at that time.
>> 
>> This also removes the last users that rely on the "amlogic,meson-uart"
>> binding. Removing that binding from the meson_uart driver is not part
>> of this series though.
>> 
>> 
>> [0] http://lists.infradead.org/pipermail/linux-amlogic/2017-June/004173.html
>> 
>
> Acked-by: Jerome Brunet <jbrunet@baylibre.com>

Applied to v4.16/dt with Jerome's ack.

Kevin