2020-11-01 02:12:08

by Christian Hewitt

Subject: [PATCH] arm64: dts: meson: add watchdog to g12-common dtsi

G12 vendor kernels show the watchdog on the same address as AXG
so add the node to meson-g12-common.dtsi. GX boards inherit the
same from meson-gx.dtsi.

v2 fix typo in node name (s/wtd/wdt)

Signed-off-by: Christian Hewitt <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 1e83ec5b8c91..314095b79a45 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -2179,6 +2179,12 @@
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
};

+ watchdog: wdt@f0d0 {
+ compatible = "amlogic,meson-gxbb-wdt";
+ reg = <0x0 0xf0d0 0x0 0x10>;
+ clocks = <&xtal>;
+ };
+
spicc0: spi@13000 {
compatible = "amlogic,meson-g12a-spicc";
reg = <0x0 0x13000 0x0 0x44>;
--
2.17.1

2020-11-02 08:43:30

by Neil Armstrong

Subject: Re: [PATCH] arm64: dts: meson: add watchdog to g12-common dtsi

On 01/11/2020 03:10, Christian Hewitt wrote:
> G12 vendor kernels show the watchdog on the same address as AXG
> so add the node to meson-g12-common.dtsi. GX boards inherit the
> same from meson-gx.dtsi.
>
> v2 fix typo in node name (s/wtd/wdt)
>
> Signed-off-by: Christian Hewitt <[email protected]>
> ---
> arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> index 1e83ec5b8c91..314095b79a45 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> @@ -2179,6 +2179,12 @@
> amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
> };
>
> + watchdog: wdt@f0d0 {
> + compatible = "amlogic,meson-gxbb-wdt";
> + reg = <0x0 0xf0d0 0x0 0x10>;
> + clocks = <&xtal>;
> + };
> +
> spicc0: spi@13000 {
> compatible = "amlogic,meson-g12a-spicc";
> reg = <0x0 0x13000 0x0 0x44>;
>

Reviewed-by: Neil Armstrong <[email protected]>

and

Tested on a VIM3L
Tested-by: Neil Armstrong <[email protected]>

2020-11-05 19:33:50

by Kevin Hilman

Subject: Re: [PATCH] arm64: dts: meson: add watchdog to g12-common dtsi

On Sun, 1 Nov 2020 02:10:12 +0000, Christian Hewitt wrote:
> G12 vendor kernels show the watchdog on the same address as AXG
> so add the node to meson-g12-common.dtsi. GX boards inherit the
> same from meson-gx.dtsi.
>
> v2 fix typo in node name (s/wtd/wdt)

Applied, thanks!

[1/1] arm64: dts: meson: add watchdog to g12-common dtsi
commit: 7bd5175918eb4b294c0979c75056f20fd90a50bf

Best regards,
--
Kevin Hilman <[email protected]>