From 97461b82f67bbc93d2f83d0d1302d3cb4e2a5f11 Mon Sep 17 00:00:00 2001 From: iav Date: Sun, 1 Nov 2020 19:42:45 +0200 Subject: [PATCH] support meson-g12 watchdog (#2295) --- ...atchdog-to-g12-common-dtsi.patch.txt.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 patch/kernel/meson64-current/dts-meson-add-watchdog-to-g12-common-dtsi.patch.txt.patch diff --git a/patch/kernel/meson64-current/dts-meson-add-watchdog-to-g12-common-dtsi.patch.txt.patch b/patch/kernel/meson64-current/dts-meson-add-watchdog-to-g12-common-dtsi.patch.txt.patch new file mode 100644 index 0000000000..8457d49eac --- /dev/null +++ b/patch/kernel/meson64-current/dts-meson-add-watchdog-to-g12-common-dtsi.patch.txt.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] arm64: dts: meson: add watchdog to g12-common dtsi +Date: Fri, 30 Oct 2020 18:00:57 +0000 +Message-Id: <20201030180057.23886-1-christianshewitt@gmail.com> + +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. + +Signed-off-by: Christian Hewitt +--- + 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..92afec3ffb2d 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>;