Skip to contentSkip to conversation

AM62x watchdog support

PATCH Superseded Julien Panis 3 participants 6 messages Nov 3, 2022

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover AM62x watchdog support

This patch series adds support for AM62x watchdog.

Changes since v0:
- Mark MCU & WKUP watchdogs as reserved

Changes since v1:
- Rebase patch to v6.1-rc3

Julien Panis (2):
arm64: dts: ti: k3-am62: add watchdog nodes
arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved

 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   | 45 ++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    |  9 +++++
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi |  9 +++++
 arch/arm64/boot/dts/ti/k3-am625-sk.dts     | 10 +++++
 4 files changed, 73 insertions(+)

base-commit: 30a0b95b1335e12efef89dd78518ed3e4a71a763

Signature · 1 line
2.37.3
#1 lore raw

PATCH v2 1/2 arm64: dts: ti: k3-am62: add watchdog nodes

Add nodes for watchdogs :
- 5 in main domain
- 1 in MCU domain
- 1 in wakeup domain

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   | 45 ++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    |  9 +++++
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi |  9 +++++
 3 files changed, 63 insertions(+)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +45 -0
index 03660476364f..fb8480d7cf76 100644
@@ -591,6 +591,51 @@ main_mcan0: can@20701000 {
 		bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
 	};
 
+	main_rti0: watchdog@e000000 {
+		compatible = "ti,j7-rti-wdt";
+		reg = <0x00 0x0e000000 0x00 0x100>;
+		clocks = <&k3_clks 125 0>;
+		power-domains = <&k3_pds 125 TI_SCI_PD_EXCLUSIVE>;
+		assigned-clocks = <&k3_clks 125 0>;
+		assigned-clock-parents = <&k3_clks 125 2>;
+	};
+
+	main_rti1: watchdog@e010000 {
+		compatible = "ti,j7-rti-wdt";
+		reg = <0x00 0x0e010000 0x00 0x100>;
+		clocks = <&k3_clks 126 0>;
+		power-domains = <&k3_pds 126 TI_SCI_PD_EXCLUSIVE>;
+		assigned-clocks = <&k3_clks 126 0>;
+		assigned-clock-parents = <&k3_clks 126 2>;
+	};
+
+	main_rti2: watchdog@e020000 {
+		compatible = "ti,j7-rti-wdt";
+		reg = <0x00 0x0e020000 0x00 0x100>;
+		clocks = <&k3_clks 127 0>;
+		power-domains = <&k3_pds 127 TI_SCI_PD_EXCLUSIVE>;
+		assigned-clocks = <&k3_clks 127 0>;
+		assigned-clock-parents = <&k3_clks 127 2>;
+	};
+
+	main_rti3: watchdog@e030000 {
+		compatible = "ti,j7-rti-wdt";
+		reg = <0x00 0x0e030000 0x00 0x100>;
+		clocks = <&k3_clks 128 0>;
+		power-domains = <&k3_pds 128 TI_SCI_PD_EXCLUSIVE>;
+		assigned-clocks = <&k3_clks 128 0>;
+		assigned-clock-parents = <&k3_clks 128 2>;
+	};
+
+	main_rti15: watchdog@e0f0000 {
+		compatible = "ti,j7-rti-wdt";
+		reg = <0x00 0x0e0f0000 0x00 0x100>;
+		clocks = <&k3_clks 130 0>;
+		power-domains = <&k3_pds 130 TI_SCI_PD_EXCLUSIVE>;
+		assigned-clocks = <&k3_clks 130 0>;
+		assigned-clock-parents = <&k3_clks 130 2>;
+	};
+
 	epwm0: pwm@23000000 {
 		compatible = "ti,am64-epwm", "ti,am3352-ehrpwm";
 		#pwm-cells = <3>;
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +9 -0
index f56c803560f2..f82e94def774 100644
@@ -81,4 +81,13 @@ mcu_gpio0: gpio@4201000 {
 		clocks = <&k3_clks 79 0>;
 		clock-names = "gpio";
 	};
+
+	mcu_rti0: watchdog@4880000 {
+		compatible = "ti,j7-rti-wdt";
+		reg = <0x00 0x04880000 0x00 0x100>;
+		clocks = <&k3_clks 131 0>;
+		power-domains = <&k3_pds 131 TI_SCI_PD_EXCLUSIVE>;
+		assigned-clocks = <&k3_clks 131 0>;
+		assigned-clock-parents = <&k3_clks 131 2>;
+	};
 };
arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi +9 -0
index 4090134676cf..3c95ac3a0dd5 100644
@@ -38,4 +38,13 @@ wkup_i2c0: i2c@2b200000 {
 		clocks = <&k3_clks 107 4>;
 		clock-names = "fck";
 	};
+
+	wkup_rti0: watchdog@2b000000 {
+		compatible = "ti,j7-rti-wdt";
+		reg = <0x00 0x2b000000 0x00 0x100>;
+		clocks = <&k3_clks 132 0>;
+		power-domains = <&k3_pds 132 TI_SCI_PD_EXCLUSIVE>;
+		assigned-clocks = <&k3_clks 132 0>;
+		assigned-clock-parents = <&k3_clks 132 2>;
+	};
 };
Signature · 1 line
2.37.3
#2 lore raw

PATCH v2 2/2 arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved

In reply to Julien Panis

MCU wdt is typically used by M4F.
Wake up wdt is typically used by DM (R5) firmware.

---
 arch/arm64/boot/dts/ti/k3-am625-sk.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/ti/k3-am625-sk.dts +10 -0
index 93a5f0817efc..9ade591ef563 100644
@@ -503,6 +503,16 @@ &main_mcan0 {
 	status = "disabled";
 };
 
+&mcu_rti0 {
+	/* MCU RTI0 is used by M4F firmware */
+	status = "reserved";
+};
+
+&wkup_rti0 {
+	/* WKUP RTI0 is used by DM firmware */
+	status = "reserved";
+};
+
 &epwm0 {
 	status = "disabled";
 };
Signature · 1 line
2.37.3
maintainer
#3 lore raw

Re: [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved

Quoted 16 lines · Julien Panis

MCU wdt is typically used by M4F.
Wake up wdt is typically used by DM (R5) firmware.

---
 arch/arm64/boot/dts/ti/k3-am625-sk.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -0
index 93a5f0817efc..9ade591ef563 100644
@@ -503,6 +503,16 @@ &main_mcan0 {
 	status = "disabled";
 };
 

arch/arm64/boot/dts/ti/k3-am625-sk.dts &main_mcan0 { · line 515

Quoted 10 lines
arch/arm64/boot/dts/ti/k3-am625-sk.dts +10 -0
+&mcu_rti0 {
+	/* MCU RTI0 is used by M4F firmware */
+	status = "reserved";
+};
+
+&wkup_rti0 {
+	/* WKUP RTI0 is used by DM firmware */
+	status = "reserved";
+};
+

If this is the typical usage, should'nt we do this in soc.dtsi than sprinkle this through various boards?

Andrew: ?

Quoted 6 lines
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -0
 &epwm0 {
 	status = "disabled";
 };
Signature · 1 line
2.37.3
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#4 lore raw

Re: [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved

Quoted 31 lines · Nishanth Menon
Quoted 16 lines · Julien Panis

MCU wdt is typically used by M4F.
Wake up wdt is typically used by DM (R5) firmware.

---
  arch/arm64/boot/dts/ti/k3-am625-sk.dts | 10 ++++++++++
  1 file changed, 10 insertions(+)
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -0
index 93a5f0817efc..9ade591ef563 100644
@@ -503,6 +503,16 @@ &main_mcan0 {
  	status = "disabled";
  };
 

arch/arm64/boot/dts/ti/k3-am625-sk.dts &main_mcan0 { · line 515

Quoted 10 lines
arch/arm64/boot/dts/ti/k3-am625-sk.dts +10 -0
+&mcu_rti0 {
+	/* MCU RTI0 is used by M4F firmware */
+	status = "reserved";
+};
+
+&wkup_rti0 {
+	/* WKUP RTI0 is used by DM firmware */
+	status = "reserved";
+};
+

If this is the typical usage, should'nt we do this in soc.dtsi than sprinkle this through various boards?

Quoted 1 line

Andrew: ?

These are only "reserved" for certain firmware, you choose your RPROCs and firmware down at the bottom level in board DTs. So I'd say these statuses should be set at this same level here.

DM firmware might be the exception as it should always be present, but for M4F firmware, meh, leave it here.

Andrew

Quoted 7 lines
Quoted 6 lines
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -0
  &epwm0 {
  	status = "disabled";
  };
Signature · 1 line
2.37.3
maintainer
#5 lore raw

Re: [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved

Quoted 31 lines · Andrew Davis
Quoted 30 lines · Nishanth Menon
Quoted 15 lines · Julien Panis

MCU wdt is typically used by M4F.
Wake up wdt is typically used by DM (R5) firmware.

---
  arch/arm64/boot/dts/ti/k3-am625-sk.dts | 10 ++++++++++
  1 file changed, 10 insertions(+)
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -0
index 93a5f0817efc..9ade591ef563 100644
@@ -503,6 +503,16 @@ &main_mcan0 {
  	status = "disabled";
  };

arch/arm64/boot/dts/ti/k3-am625-sk.dts &main_mcan0 { · line 514

Quoted 10 lines
arch/arm64/boot/dts/ti/k3-am625-sk.dts +10 -0
+&mcu_rti0 {
+	/* MCU RTI0 is used by M4F firmware */
+	status = "reserved";
+};
+
+&wkup_rti0 {
+	/* WKUP RTI0 is used by DM firmware */
+	status = "reserved";
+};
+

If this is the typical usage, should'nt we do this in soc.dtsi than sprinkle this through various boards?

Quoted 9 lines
Quoted 1 line

Andrew: ?

These are only "reserved" for certain firmware, you choose your RPROCs and firmware down at the bottom level in board DTs. So I'd say these statuses should be set at this same level here.

DM firmware might be the exception as it should always be present, but for M4F firmware, meh, leave it here.

That makes sense.. Julien: Could you address this please?

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D