Commit 9d69294b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-watchdog-5.14-rc1' of git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog updates from Wim Van Sebroeck:

 - Add Mstar MSC313e WDT driver

 - Add support for sama7g5-wdt

 - Add compatible for SC7280 SoC

 - Add compatible for Mediatek MT8195

 - sbsa: Support architecture version 1

 - Removal of the MV64x60 watchdog driver

 - Extra PCI IDs for hpwdt

 - Add hrtimer-based pretimeout feature

 - Add {min,max}_timeout sysfs nodes

 - keembay timeout and pre-timeout handling

 - Several fixes, cleanups and improvements

* tag 'linux-watchdog-5.14-rc1' of git://www.linux-watchdog.org/linux-watchdog: (56 commits)
  watchdog: iTCO_wdt: use dev_err() instead of pr_err()
  watchdog: Add Mstar MSC313e WDT driver
  dt-bindings: watchdog: Add Mstar MSC313e WDT devicetree bindings documentation
  watchdog: iTCO_wdt: Account for rebooting on second timeout
  dt-bindings: watchdog: Convert arm,sbsa-gwdt to DT schema
  dt-bindings: watchdog: sama5d4-wdt: add compatible for sama7g5-wdt
  watchdog: sama5d4_wdt: add support for sama7g5-wdt
  dt-bindings: watchdog: sama5d4-wdt: convert to yaml
  watchdog: ziirave_wdt: Remove VERSION_FMT defines and add sysfs newlines
  dt-bindings: watchdog: Add compatible for Mediatek MT8195
  dt-bindings: watchdog: dw-wdt: add description for rk3568
  watchdog: imx_sc_wdt: fix pretimeout
  watchdog: diag288_wdt: Remove redundant assignment
  watchdog: Add hrtimer-based pretimeout feature
  dt-bindings: watchdog: Add compatible for SC7280 SoC
  watchdog: qcom: Move suspend/resume to suspend_late/resume_early
  watchdog: Fix a typo in the file orion_wdt.c
  watchdog: jz4740: Fix return value check in jz4740_wdt_probe()
  watchdog: Remove MV64x60 watchdog driver
  doc: mtk-wdt: support pre-timeout when the bark irq is available
  ...
parents 0cc2ea8c cf813c67

Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml

0 → 100644
+74 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/watchdog/atmel,sama5d4-wdt.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Atmel SAMA5D4 Watchdog Timer (WDT) Controller



maintainers:

  - Eugen Hristev <eugen.hristev@microchip.com>



allOf:

  - $ref: "watchdog.yaml#"



properties:

  compatible:

    enum:

      - atmel,sama5d4-wdt

      - microchip,sam9x60-wdt

      - microchip,sama7g5-wdt



  reg:

    maxItems: 1



  atmel,watchdog-type:

    $ref: /schemas/types.yaml#/definitions/string

    description: should be hardware or software.

    oneOf:

      - description:

          Enable watchdog fault reset. A watchdog fault triggers

          watchdog reset.

        const: hardware

      - description:

          Enable watchdog fault interrupt. A watchdog fault asserts

          watchdog interrupt.

        const: software

    default: hardware



  atmel,idle-halt:

    $ref: /schemas/types.yaml#/definitions/flag

    description: |

      present if you want to stop the watchdog when the CPU is in idle state.

      CAUTION: This property should be used with care, it actually makes the

      watchdog not counting when the CPU is in idle state, therefore the

      watchdog reset time depends on mean CPU usage and will not reset at all

      if the CPU stop working while it is in idle state, which is probably

      not what you want.



  atmel,dbg-halt:

    $ref: /schemas/types.yaml#/definitions/flag

    description: |

      present if you want to stop the watchdog when the CPU is in debug state.



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>



    watchdog@fc068640 {

      compatible = "atmel,sama5d4-wdt";

      reg = <0xfc068640 0x10>;

      interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>;

      timeout-sec = <10>;

      atmel,watchdog-type = "hardware";

      atmel,dbg-halt;

      atmel,idle-halt;

    };



...

Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt

deleted100644 → 0
+0 −34
Original line number Original line Diff line number Diff line 
* Atmel SAMA5D4 Watchdog Timer (WDT) Controller



Required properties:

- compatible: "atmel,sama5d4-wdt" or "microchip,sam9x60-wdt"

- reg: base physical address and length of memory mapped region.



Optional properties:

- timeout-sec: watchdog timeout value (in seconds).

- interrupts: interrupt number to the CPU.

- atmel,watchdog-type: should be "hardware" or "software".

	"hardware": enable watchdog fault reset. A watchdog fault triggers

		    watchdog reset.

	"software": enable watchdog fault interrupt. A watchdog fault asserts

		    watchdog interrupt.

- atmel,idle-halt: present if you want to stop the watchdog when the CPU is

		   in idle state.

	CAUTION: This property should be used with care, it actually makes the

	watchdog not counting when the CPU is in idle state, therefore the

	watchdog reset time depends on mean CPU usage and will not reset at all

	if the CPU stop working while it is in idle state, which is probably

	not what you want.

- atmel,dbg-halt: present if you want to stop the watchdog when the CPU is

		  in debug state.



Example:

	watchdog@fc068640 {

		compatible = "atmel,sama5d4-wdt";

		reg = <0xfc068640 0x10>;

		interrupts = <4 IRQ_TYPE_LEVEL_HIGH 5>;

		timeout-sec = <10>;

		atmel,watchdog-type = "hardware";

		atmel,dbg-halt;

		atmel,idle-halt;

	};

Documentation/devicetree/bindings/watchdog/mstar,msc313e-wdt.yaml

0 → 100644
+40 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/watchdog/mstar,msc313e-wdt.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: MStar Watchdog Device Tree Bindings



maintainers:

  - Daniel Palmer <daniel@0x0f.com>

  - Romain Perier <romain.perier@gmail.com>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    enum:

      - mstar,msc313e-wdt



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - clocks

  - reg



unevaluatedProperties: false



examples:

  - |

    watchdog@6000 {

        compatible = "mstar,msc313e-wdt";

        reg = <0x6000 0x1f>;

        clocks = <&xtal_div2>;

    };

Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

+6 −0
Original line number Original line Diff line number Diff line 
Mediatek SoCs Watchdog timer

Mediatek SoCs Watchdog timer





The watchdog supports a pre-timeout interrupt that fires timeout-sec/2

before the expiry.



Required properties:

Required properties:





- compatible should contain:

- compatible should contain:
@@ -13,10 +16,12 @@ Required properties: 
	"mediatek,mt8183-wdt": for MT8183

	"mediatek,mt8183-wdt": for MT8183

	"mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516

	"mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516

	"mediatek,mt8192-wdt": for MT8192

	"mediatek,mt8192-wdt": for MT8192

	"mediatek,mt8195-wdt", "mediatek,mt6589-wdt": for MT8195





- reg : Specifies base physical address and size of the registers.

- reg : Specifies base physical address and size of the registers.





Optional properties:

Optional properties:

- interrupts: Watchdog pre-timeout (bark) interrupt.

- timeout-sec: contains the watchdog timeout in seconds.

- timeout-sec: contains the watchdog timeout in seconds.

- #reset-cells: Should be 1.

- #reset-cells: Should be 1.
@@ -26,6 +31,7 @@ watchdog: watchdog@10007000 { 
	compatible = "mediatek,mt8183-wdt",

	compatible = "mediatek,mt8183-wdt",

		     "mediatek,mt6589-wdt";

		     "mediatek,mt6589-wdt";

	reg = <0 0x10007000 0 0x100>;

	reg = <0 0x10007000 0 0x100>;

	interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>;

	timeout-sec = <10>;

	timeout-sec = <10>;

	#reset-cells = <1>;

	#reset-cells = <1>;

};
 
};

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
    enum:

    enum:

      - qcom,apss-wdt-qcs404

      - qcom,apss-wdt-qcs404

      - qcom,apss-wdt-sc7180

      - qcom,apss-wdt-sc7180

      - qcom,apss-wdt-sc7280

      - qcom,apss-wdt-sdm845

      - qcom,apss-wdt-sdm845

      - qcom,apss-wdt-sdx55

      - qcom,apss-wdt-sdx55

      - qcom,apss-wdt-sm8150

      - qcom,apss-wdt-sm8150