linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/2] AM62x watchdog support
@ 2022-11-03 18:14 Julien Panis
  2022-11-03 18:14 ` [PATCH v2 1/2] arm64: dts: ti: k3-am62: add watchdog nodes Julien Panis
  2022-11-03 18:14 ` [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved Julien Panis
  0 siblings, 2 replies; 6+ messages in thread
From: Julien Panis @ 2022-11-03 18:14 UTC (permalink / raw)
  To: nm, vigneshr, kristo, robh+dt, krzysztof.kozlowski+dt, linux-arm-kernel
  Cc: devicetree, linux-kernel

This patch series adds support for AM62x watchdog.

Changes since v0:
	- Mark MCU & WKUP watchdogs as reserved
Link: https://lore.kernel.org/all/20220630070826.11074-1-jpanis@baylibre.com/

Changes since v1:
	- Rebase patch to v6.1-rc3
Link: https://lore.kernel.org/all/20220718122328.251602-1-jpanis@baylibre.com/

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
-- 
2.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2 1/2] arm64: dts: ti: k3-am62: add watchdog nodes
  2022-11-03 18:14 [PATCH v2 0/2] AM62x watchdog support Julien Panis
@ 2022-11-03 18:14 ` Julien Panis
  2022-11-03 18:14 ` [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved Julien Panis
  1 sibling, 0 replies; 6+ messages in thread
From: Julien Panis @ 2022-11-03 18:14 UTC (permalink / raw)
  To: nm, vigneshr, kristo, robh+dt, krzysztof.kozlowski+dt, linux-arm-kernel
  Cc: devicetree, linux-kernel

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

Signed-off-by: Julien Panis <jpanis@baylibre.com>
---
 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(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 03660476364f..fb8480d7cf76 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -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>;
diff --git a/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
index f56c803560f2..f82e94def774 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
@@ -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>;
+	};
 };
diff --git a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
index 4090134676cf..3c95ac3a0dd5 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
@@ -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>;
+	};
 };
-- 
2.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved
  2022-11-03 18:14 [PATCH v2 0/2] AM62x watchdog support Julien Panis
  2022-11-03 18:14 ` [PATCH v2 1/2] arm64: dts: ti: k3-am62: add watchdog nodes Julien Panis
@ 2022-11-03 18:14 ` Julien Panis
  2022-11-03 21:47   ` Nishanth Menon
  1 sibling, 1 reply; 6+ messages in thread
From: Julien Panis @ 2022-11-03 18:14 UTC (permalink / raw)
  To: nm, vigneshr, kristo, robh+dt, krzysztof.kozlowski+dt, linux-arm-kernel
  Cc: devicetree, linux-kernel

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

Signed-off-by: Julien Panis <jpanis@baylibre.com>
---
 arch/arm64/boot/dts/ti/k3-am625-sk.dts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
index 93a5f0817efc..9ade591ef563 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
@@ -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";
 };
-- 
2.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved
  2022-11-03 18:14 ` [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved Julien Panis
@ 2022-11-03 21:47   ` Nishanth Menon
  2022-11-03 22:36     ` Andrew Davis
  0 siblings, 1 reply; 6+ messages in thread
From: Nishanth Menon @ 2022-11-03 21:47 UTC (permalink / raw)
  To: Julien Panis, afd
  Cc: vigneshr, kristo, robh+dt, krzysztof.kozlowski+dt,
	linux-arm-kernel, devicetree, linux-kernel

On 19:14-20221103, Julien Panis wrote:
> MCU wdt is typically used by M4F.
> Wake up wdt is typically used by DM (R5) firmware.
> 
> Signed-off-by: Julien Panis <jpanis@baylibre.com>
> ---
>  arch/arm64/boot/dts/ti/k3-am625-sk.dts | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
> index 93a5f0817efc..9ade591ef563 100644
> --- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
> @@ -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";
> +};
> +

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

Andrew: ?
>  &epwm0 {
>  	status = "disabled";
>  };
> -- 
> 2.37.3
> 

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved
  2022-11-03 21:47   ` Nishanth Menon
@ 2022-11-03 22:36     ` Andrew Davis
  2022-11-03 23:10       ` Nishanth Menon
  0 siblings, 1 reply; 6+ messages in thread
From: Andrew Davis @ 2022-11-03 22:36 UTC (permalink / raw)
  To: Nishanth Menon, Julien Panis
  Cc: vigneshr, kristo, robh+dt, krzysztof.kozlowski+dt,
	linux-arm-kernel, devicetree, linux-kernel

On 11/3/22 4:47 PM, Nishanth Menon wrote:
> On 19:14-20221103, Julien Panis wrote:
>> MCU wdt is typically used by M4F.
>> Wake up wdt is typically used by DM (R5) firmware.
>>
>> Signed-off-by: Julien Panis <jpanis@baylibre.com>
>> ---
>>   arch/arm64/boot/dts/ti/k3-am625-sk.dts | 10 ++++++++++
>>   1 file changed, 10 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
>> index 93a5f0817efc..9ade591ef563 100644
>> --- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
>> +++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
>> @@ -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";
>> +};
>> +
> 
> If this is the typical usage, should'nt we do this in soc.dtsi than
> sprinkle this through various boards?
> 
> 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

>>   &epwm0 {
>>   	status = "disabled";
>>   };
>> -- 
>> 2.37.3
>>
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved
  2022-11-03 22:36     ` Andrew Davis
@ 2022-11-03 23:10       ` Nishanth Menon
  0 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2022-11-03 23:10 UTC (permalink / raw)
  To: Andrew Davis
  Cc: Julien Panis, vigneshr, kristo, robh+dt, krzysztof.kozlowski+dt,
	linux-arm-kernel, devicetree, linux-kernel

On 17:36-20221103, Andrew Davis wrote:
> On 11/3/22 4:47 PM, Nishanth Menon wrote:
> > On 19:14-20221103, Julien Panis wrote:
> > > MCU wdt is typically used by M4F.
> > > Wake up wdt is typically used by DM (R5) firmware.
> > > 
> > > Signed-off-by: Julien Panis <jpanis@baylibre.com>
> > > ---
> > >   arch/arm64/boot/dts/ti/k3-am625-sk.dts | 10 ++++++++++
> > >   1 file changed, 10 insertions(+)
> > > 
> > > diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
> > > index 93a5f0817efc..9ade591ef563 100644
> > > --- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts
> > > +++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts
> > > @@ -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";
> > > +};
> > > +
> > 
> > If this is the typical usage, should'nt we do this in soc.dtsi than
> > sprinkle this through various boards?
> > 
> > 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?

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-11-03 23:11 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-03 18:14 [PATCH v2 0/2] AM62x watchdog support Julien Panis
2022-11-03 18:14 ` [PATCH v2 1/2] arm64: dts: ti: k3-am62: add watchdog nodes Julien Panis
2022-11-03 18:14 ` [PATCH v2 2/2] arm64: dts: ti: k3-am625-sk: mark MCU and WKUP watchdogs as reserved Julien Panis
2022-11-03 21:47   ` Nishanth Menon
2022-11-03 22:36     ` Andrew Davis
2022-11-03 23:10       ` Nishanth Menon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).