[PATCH 0/3] arm64: dts: qcom: sm8650-valve-deckard: Add watchdog support

[PATCH 0/3] arm64: dts: qcom: sm8650-valve-deckard: Add watchdog support

[Neil Armstrong]

This series adds Qualcomm SM8650 watchdog support for the Deckard
platform by updating both the binding and the SM8650 devicetree.

The watchdog is marked as reserved by default since most boards
uses the Gunhyah Hypervisor which owns the watchdog.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
Neil Armstrong (3):
      dt-bindings: watchdog: qcom-wdt: Document SM8650 watchdog
      arm64: dts: qcom: sm8650: Add watchdog node
      arm64: dts: qcom: sm8650-valve-deckard: enable the watchdog

 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 1 +
 arch/arm64/boot/dts/qcom/sm8650-valve-deckard.dts        | 4 ++++
 arch/arm64/boot/dts/qcom/sm8650.dtsi                     | 8 ++++++++
 3 files changed, 13 insertions(+)
---
base-commit: 9f24d789f03b22941b905ded43cb5ff8eea9ce62
change-id: 20261002-topic-sm8650-deckard-watchdog-7f2834c2523f

Best regards,
--  
Neil Armstrong <neil.armstrong@linaro.org>

[PATCH 1/3] dt-bindings: watchdog: qcom-wdt: Document SM8650 watchdog

[Neil Armstrong]

Add the SM8650 compatible string to Qualcomm watchdog binding.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
index 4ff61102e407..31f9dd24c29f 100644
--- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
@@ -50,6 +50,7 @@ properties:
               - qcom,apss-wdt-sm6350
               - qcom,apss-wdt-sm8150
               - qcom,apss-wdt-sm8250
+              - qcom,apss-wdt-sm8650
               - qcom,apss-wdt-x1e80100
           - const: qcom,kpss-wdt
       - const: qcom,kpss-wdt

-- 
2.34.1

[PATCH 2/3] arm64: dts: qcom: sm8650: Add watchdog node

[Neil Armstrong]

Add a node for the watchdog on the SM8650 SoC, the node
is marked as reserved since on most platforms the Watchdog
is owned by the Gunyah Hypervisor.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8650.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
index 86fbb0fd6472..f33ed7909a8e 100644
--- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
@@ -7311,6 +7311,14 @@ gic_its: msi-controller@17140000 {
 			};
 		};
 
+		watchdog: watchdog@17411000 {
+			compatible = "qcom,apss-wdt-sm8650", "qcom,kpss-wdt";
+			reg = <0 0x17411000 0 0x1000>;
+			clocks = <&sleep_clk>;
+			interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING 0>;
+			status = "reserved"; /* Owned by hypervisor */
+		};
+
 		timer@17420000 {
 			compatible = "arm,armv7-timer-mem";
 			reg = <0 0x17420000 0 0x1000>;

-- 
2.34.1

[PATCH 3/3] arm64: dts: qcom: sm8650-valve-deckard: enable the watchdog

[Neil Armstrong]

Since Linux is loaded in EL2 on the Deckard platform, the
watchdog is usable by the operating system and can be enabled.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8650-valve-deckard.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8650-valve-deckard.dts b/arch/arm64/boot/dts/qcom/sm8650-valve-deckard.dts
index d25a09e162dd..197f08487974 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-valve-deckard.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-valve-deckard.dts
@@ -1283,6 +1283,10 @@ &usb_1_hsphy {
 	status = "okay";
 };
 
+&watchdog {
+	status = "okay";
+};
+
 &xo_board {
 	clock-frequency = <76800000>;
 };

-- 
2.34.1

Re: [PATCH 2/3] arm64: dts: qcom: sm8650: Add watchdog node

[Abel Vesa]

On 26-10-02 11:45:29, Neil Armstrong wrote:
> Add a node for the watchdog on the SM8650 SoC, the node
> is marked as reserved since on most platforms the Watchdog
> is owned by the Gunyah Hypervisor.
> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>

Re: [PATCH 3/3] arm64: dts: qcom: sm8650-valve-deckard: enable the watchdog

[Abel Vesa]

On 26-10-02 11:45:30, Neil Armstrong wrote:
> Since Linux is loaded in EL2 on the Deckard platform, the
> watchdog is usable by the operating system and can be enabled.
> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>

Re: [PATCH 1/3] dt-bindings: watchdog: qcom-wdt: Document SM8650 watchdog

[Krzysztof Kozlowski]

On Fri, Oct 02, 2026 at 11:45:28AM +0200, Neil Armstrong wrote:
> Add the SM8650 compatible string to Qualcomm watchdog binding.
> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
>  Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 1 +
>  1 file changed, 1 insertion(+)

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

Re: [PATCH 2/3] arm64: dts: qcom: sm8650: Add watchdog node

[Konrad Dybcio]

On 10/2/26 11:45 AM, Neil Armstrong wrote:
> Add a node for the watchdog on the SM8650 SoC, the node
> is marked as reserved since on most platforms the Watchdog
> is owned by the Gunyah Hypervisor.
> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---

Do you have a HDK or something with gunyah at hand? A couple months
ago qcom_scm_gunyah_wdt_init() was introduced to handle this -
could you enable the node and give it a shot if you have one?

Konrad

>  arch/arm64/boot/dts/qcom/sm8650.dtsi | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
> index 86fbb0fd6472..f33ed7909a8e 100644
> --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
> @@ -7311,6 +7311,14 @@ gic_its: msi-controller@17140000 {
>  			};
>  		};
>  
> +		watchdog: watchdog@17411000 {
> +			compatible = "qcom,apss-wdt-sm8650", "qcom,kpss-wdt";
> +			reg = <0 0x17411000 0 0x1000>;
> +			clocks = <&sleep_clk>;
> +			interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING 0>;
> +			status = "reserved"; /* Owned by hypervisor */
> +		};
> +
>  		timer@17420000 {
>  			compatible = "arm,armv7-timer-mem";
>  			reg = <0 0x17420000 0 0x1000>;
> 

Re: [PATCH 2/3] arm64: dts: qcom: sm8650: Add watchdog node

[Neil Armstrong]

On 10/13/26 11:21, Konrad Dybcio wrote:
> On 10/2/26 11:45 AM, Neil Armstrong wrote:
>> Add a node for the watchdog on the SM8650 SoC, the node
>> is marked as reserved since on most platforms the Watchdog
>> is owned by the Gunyah Hypervisor.
>>
>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
>> ---
> 
> Do you have a HDK or something with gunyah at hand? A couple months
> ago qcom_scm_gunyah_wdt_init() was introduced to handle this -
> could you enable the node and give it a shot if you have one?

Why enabling the node ? the qcom_scm_gunyah_wdt_init() will bail out
if the node is enabled. Here we only want the node to be enabled when
we are in EL1 without Gunyah.

Neil

> 
> Konrad
> 
>>   arch/arm64/boot/dts/qcom/sm8650.dtsi | 8 ++++++++
>>   1 file changed, 8 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
>> index 86fbb0fd6472..f33ed7909a8e 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
>> @@ -7311,6 +7311,14 @@ gic_its: msi-controller@17140000 {
>>   			};
>>   		};
>>   
>> +		watchdog: watchdog@17411000 {
>> +			compatible = "qcom,apss-wdt-sm8650", "qcom,kpss-wdt";
>> +			reg = <0 0x17411000 0 0x1000>;
>> +			clocks = <&sleep_clk>;
>> +			interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING 0>;
>> +			status = "reserved"; /* Owned by hypervisor */
>> +		};
>> +
>>   		timer@17420000 {
>>   			compatible = "arm,armv7-timer-mem";
>>   			reg = <0 0x17420000 0 0x1000>;
>>

Re: [PATCH 2/3] arm64: dts: qcom: sm8650: Add watchdog node

[Konrad Dybcio]

On 10/13/26 4:09 PM, Neil Armstrong wrote:
> On 10/13/26 11:21, Konrad Dybcio wrote:
>> On 10/2/26 11:45 AM, Neil Armstrong wrote:
>>> Add a node for the watchdog on the SM8650 SoC, the node
>>> is marked as reserved since on most platforms the Watchdog
>>> is owned by the Gunyah Hypervisor.
>>>
>>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
>>> ---
>>
>> Do you have a HDK or something with gunyah at hand? A couple months
>> ago qcom_scm_gunyah_wdt_init() was introduced to handle this -
>> could you enable the node and give it a shot if you have one?
> 
> Why enabling the node ? the qcom_scm_gunyah_wdt_init() will bail out
> if the node is enabled. Here we only want the node to be enabled when
> we are in EL1 without Gunyah.

Right, sorry, I misremembered and then misread

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH 3/3] arm64: dts: qcom: sm8650-valve-deckard: enable the watchdog

[Konrad Dybcio]

On 10/2/26 11:45 AM, Neil Armstrong wrote:
> Since Linux is loaded in EL2 on the Deckard platform, the
> watchdog is usable by the operating system and can be enabled.
> 
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---

Preferably this would go to sm8650-el2.dtso but that's fine for
some future change that also belongs there

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad