Merge "ARM: dts: msm: Remove unused bite irq from msm watchdog for Shima" (7b58ffb3) · Commits · e / devices / android_kernel_fairphone_FP5

bindings/arm/msm/hh_watchdog.yaml

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/bindings/arm/msm/hh_watchdog.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: QTI HH Watchdog

		maintainers:

		description: \|+
		Watchdog timer is configured with a bark and a bite time.
		If the watchdog is not "pet" at regular intervals, the system
		is assumed to have become non responsive and needs to be reset.
		A warning in the form of a bark timeout leads to a bark interrupt
		and a kernel panic. If the watchdog timer is still not reset,
		a bite timeout occurs, which leads to a reset of the VM via
		the hypervisor. The driver needs the petting time, and the bark
		timeout to be programmed into the watchdog, as well as the bark irq.

		The device tree parameters for the watchdog are:

		properties:
		compatible:
		Usage: required
		Value type: <string>
		Definition: Must be "qcom,hh-watchdog"

		interrupts:
		Usage: required
		Value type: <prop-encoded-array>
		Definition: should contain the bark irq number

		example:
		- \|
		wdog_hh: qcom,wdt_hh {
		compatible = "qcom,hh-watchdog";
		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>;
		};
		...

+0 −33

Original line number	Diff line number	Diff line
		@@ -44,35 +44,6 @@ properties:
		Value type: <prop-encoded-array>
		Definition: should contain bark and bite irq numbers

		qcom,pet-time:
		Usage: required
		Value type: <u32>
		Definition: Non zero time interval at which watchdog should be pet in ms.

		qcom,bark-time:
		Usage: required
		Value type: <u32>
		Definition: Non zero timeout value for a watchdog bark in ms.

		qcom,userspace-watchdog:
		Usage: optional
		Value type: <boolean>
		Definition: Allow enabling the userspace-watchdog feature. This feature
		requires userspace to pet the watchdog every qcom,pet-time interval
		in addition to the existing kernel-level checks.
		This feature is supported through device sysfs files.

		qcom,ipi-ping:
		Usage: optional
		Value type: <boolean>
		Definition: send keep alive ping to other cpus if present

		qcom,wakeup-enable:
		Usage: optional
		Value type: <boolean>
		Definition: enable non secure watchdog to freeze / unfreeze
		automatically across suspend / resume path.

		example:
		- \|
		wdog: qcom,wdt@17c10000{
		@@ -81,9 +52,5 @@ example:
		reg-names = "wdt-base";
		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
		<0 1 IRQ_TYPE_LEVEL_HIGH>;
		qcom,bark-time = <11000>;
		qcom,pet-time = <9360>;
		qcom,ipi-ping;
		qcom,wakeup-enable;
		};
		...

+1 −6

Original line number	Diff line number	Diff line
		@@ -4119,12 +4119,7 @@
		compatible = "qcom,msm-watchdog";
		reg = <0x17c10000 0x1000>;
		reg-names = "wdt-base";
		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
		<0 1 IRQ_TYPE_LEVEL_HIGH>;
		qcom,bark-time = <11000>;
		qcom,pet-time = <9360>;
		qcom,ipi-ping;
		qcom,wakeup-enable;
		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>;
		};

		tsens0:tsens@c222000 {

+1 −6

Original line number	Diff line number	Diff line
		@@ -512,12 +512,7 @@
		compatible = "qcom,msm-watchdog";
		reg = <0x17c10000 0x1000>;
		reg-names = "wdt-base";
		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
		qcom,bark-time = <11000>;
		qcom,pet-time = <9360>;
		qcom,ipi-ping;
		qcom,wakeup-enable;
		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
		};

		arch_timer: timer {