ARM: meson: watchdog driver
Subsystems (4)
v4 cover ARM: meson: watchdog driver
This patchset adds support for the watchdog found on Amlogic MesonX SoCs. The watchdog is used also to reboot the device.
DTSI and multi_v7_defconfig are updated and proper documentation is added.
No documentation is provided by Amlogic, the code is reverse-engineered by the code available at http://openlinux.amlogic.com:8000/download/
This patchset depends on:
[1] [PATCH 0/6] ARM: meson: initial support for MesonX SoCs
[2] [PATCH 0/2] ARM: meson: add clocksource support
Changes since v3:
* addressed checkpatch warning
Changes since v2:
* changed compatible to "amlogic,meson6-wdt"
* removed useless code
* code refactored
Changes since v1:
* added restart handler support
Carlo Caione (4):
ARM: docs: add documentation binding for meson watchdog
ARM: meson: add watchdog driver
ARM: DTS: meson: update DTSI to add watchdog node
ARM: defconfig: update multi_v7_defconfig
.../devicetree/bindings/watchdog/meson6-wdt.txt | 13 ++ arch/arm/boot/dts/meson.dtsi | 5 + arch/arm/configs/multi_v7_defconfig | 1 + drivers/watchdog/Kconfig | 10 + drivers/watchdog/Makefile | 1 + drivers/watchdog/meson_wdt.c | 236 +++++++++++++++++++++ 6 files changed, 266 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt create mode 100644 drivers/watchdog/meson_wdt.c
Signature · 1 line
1.9.1
PATCH v4 1/4 ARM: docs: add documentation binding for meson watchdog
--- Documentation/devicetree/bindings/watchdog/meson6-wdt.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt
Documentation/devicetree/bindings/watchdog/meson6-wdt.txt new file +13 -0
@@ -0,0 +1,13 @@ +Meson SoCs Watchdog timer + +Required properties: + +- compatible : should be "amlogic,meson6-wdt" +- reg : Specifies base physical address and size of the registers. + +Example: + +wdt: watchdog at c1109900 { + compatible = "amlogic,meson6-wdt"; + reg = <0xc1109900 0x8>; +};
Signature · 1 line
1.9.1
PATCH v4 2/4 ARM: meson: add watchdog driver
In reply to Carlo CaioneThis patch adds the watchdog driver for the Amlogic Meson SoCs used also to reboot the device.
--- drivers/watchdog/Kconfig | 10 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/meson_wdt.c | 236 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 247 insertions(+) create mode 100644 drivers/watchdog/meson_wdt.c
drivers/watchdog/Kconfig +10 -0
@@ -443,6 +443,16 @@ config TEGRA_WATCHDOG To compile this driver as a module, choose M here: the module will be called tegra_wdt. +config MESON_WATCHDOG + tristate "Amlogic Meson SoCs watchdog support" + depends on ARCH_MESON + select WATCHDOG_CORE + help + Say Y here to include support for the watchdog timer + in Amlogic Meson SoCs. + To compile this driver as a module, choose M here: the + module will be called meson_wdt. + # AVR32 Architecture config AT32AP700X_WDT
drivers/watchdog/Makefile +1 -0
@@ -59,6 +59,7 @@ obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o obj-$(CONFIG_BCM_KONA_WDT) += bcm_kona_wdt.o obj-$(CONFIG_TEGRA_WATCHDOG) += tegra_wdt.o +obj-$(CONFIG_MESON_WATCHDOG) += meson_wdt.o # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
drivers/watchdog/meson_wdt.c new file +236 -0
236 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v4 3/4 ARM: DTS: meson: update DTSI to add watchdog node
In reply to Carlo Caione--- arch/arm/boot/dts/meson.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/meson.dtsi +5 -0
@@ -70,6 +70,11 @@ #size-cells = <1>; ranges; + wdt: watchdog at c1109900 { + compatible = "amlogic,meson6-wdt"; + reg = <0xc1109900 0x8>; + }; + uart_AO: serial at c81004c0 { compatible = "amlogic,meson-uart"; reg = <0xc81004c0 0x14>;
Signature · 1 line
1.9.1
PATCH v4 3/4 ARM: DTS: meson: update DTSI to add watchdog node
Quoted 12 lines · Carlo Caione
Reviewed-by Guenter Roeck <[email protected]>Signed-off-by Carlo Caione <[email protected]>--- arch/arm/boot/dts/meson.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm/boot/dts/meson.dtsi +0
-0@@ -70,6 +70,11 @@ #size-cells = <1>;
arch/arm/boot/dts/meson.dtsi line 80
Quoted 10 lines
arch/arm/boot/dts/meson.dtsi +5
-0ranges; + wdt: watchdog at c1109900 { + compatible = "amlogic,meson6-wdt"; + reg = <0xc1109900 0x8>; + }; + uart_AO: serial at c81004c0 { compatible = "amlogic,meson-uart"; reg = <0xc81004c0 0x14>;
Hi Arnd and Guenter,
who is supposed to take in this patch? The basic support for the SoC is already in the arm-soc tree (thanks Arnd) and the other three patches of this patchset are going in through Guenter tree (thanks Guenter).
BR,
Signature · 1 line
Carlo Caione
PATCH v4 3/4 ARM: DTS: meson: update DTSI to add watchdog node
Quoted 6 lines · On Friday 26 September 2014 10:04:45 Carlo Caione wrote:
Hi Arnd and Guenter,
who is supposed to take in this patch? The basic support for the SoC is already in the arm-soc tree (thanks Arnd) and the other three patches of this patchset are going in through Guenter tree (thanks Guenter).
It should go through the arm-soc tree.
Arnd
PATCH v4 3/4 ARM: DTS: meson: update DTSI to add watchdog node
Quoted 9 lines · Arnd Bergmann
Quoted 6 lines · On Friday 26 September 2014 10:04:45 Carlo Caione wrote:
Hi Arnd and Guenter,
who is supposed to take in this patch? The basic support for the SoC is already in the arm-soc tree (thanks Arnd) and the other three patches of this patchset are going in through Guenter tree (thanks Guenter).It should go through the arm-soc tree.
Could you take it?
Thanks,
Signature · 1 line
Carlo Caione
PATCH v4 3/4 ARM: DTS: meson: update DTSI to add watchdog node
In reply to Arnd BergmannQuoted 9 lines · Arnd Bergmann
Quoted 6 lines · On Friday 26 September 2014 10:04:45 Carlo Caione wrote:
Hi Arnd and Guenter,
who is supposed to take in this patch? The basic support for the SoC is already in the arm-soc tree (thanks Arnd) and the other three patches of this patchset are going in through Guenter tree (thanks Guenter).It should go through the arm-soc tree.
Arnd,
do you want me to submit a standalone patch for this?
Thanks,
Signature · 1 line
Carlo Caione
PATCH v4 4/4 ARM: defconfig: update multi_v7_defconfig
In reply to Carlo CaioneUpdate the multi_v7_defconfig enabling the watchdog driver for Meson SoCs.
--- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v7_defconfig +1 -0
@@ -242,6 +242,7 @@ CONFIG_ST_THERMAL_MEMMAP=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y +CONFIG_MESON_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_BCM590XX=y CONFIG_MFD_CROS_EC=y
Signature · 1 line
1.9.1