[PATCH V3 0/2] arm64: dts: ti: k3-am62: Add watchdog and rtc nodes

[PATCH V3 0/2] arm64: dts: ti: k3-am62: Add watchdog and rtc nodes

[Nishanth Menon]

Hi,

Couple of Misc patches

Changes since v2:
 - Picked up Reviewed-bys
 - wdt node rename to match with TRM

V2: https://lore.kernel.org/all/20230315170706.1598977-1-nm@ti.com/
V1: https://lore.kernel.org/all/20230311105850.21811-1-nm@ti.com/#t

Julien Panis (1):
  arm64: dts: ti: k3-am62: Add watchdog nodes

Nishanth Menon (1):
  arm64: dts: ti: k3-am62-wakeup: Introduce RTC node

 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   | 45 ++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    | 11 ++++++
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 21 ++++++++++
 3 files changed, 77 insertions(+)

-- 
2.40.0

[PATCH V3 1/2] arm64: dts: ti: k3-am62-wakeup: Introduce RTC node

[Nishanth Menon]

Introduce digital RTC node in wakeup domain. Even though this has
no specific battery backup supply, this on-chip RTC is used in
cost-optimized board designs as a wakeup source.

Reviewed-by: Dhruva Gole <d-gole@ti.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Changes since v2:
- Just reviewed-by pickups

V2: https://lore.kernel.org/all/20230315170706.1598977-2-nm@ti.com/
V1: https://lore.kernel.org/all/20230311105850.21811-2-nm@ti.com/

 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
index 38dced6b4fef..fec81546fbbd 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
@@ -40,4 +40,14 @@ wkup_i2c0: i2c@2b200000 {
 		clock-names = "fck";
 		status = "disabled";
 	};
+
+	wkup_rtc0: rtc@2b1f0000 {
+		compatible = "ti,am62-rtc";
+		reg = <0x00 0x2b1f0000 0x00 0x100>;
+		interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 117 6> , <&k3_clks 117 0>;
+		clock-names = "vbus", "osc32k";
+		power-domains = <&k3_pds 117 TI_SCI_PD_EXCLUSIVE>;
+		wakeup-source;
+	};
 };
-- 
2.40.0

Re: [PATCH V3 1/2] arm64: dts: ti: k3-am62-wakeup: Introduce RTC node

[Dhruva Gole]

Hi,

On 20/03/23 22:21, Nishanth Menon wrote:
> Introduce digital RTC node in wakeup domain. Even though this has
> no specific battery backup supply, this on-chip RTC is used in
> cost-optimized board designs as a wakeup source.
>
> Reviewed-by: Dhruva Gole <d-gole@ti.com>
> Reviewed-by: Bryan Brattlof <bb@ti.com>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
> Changes since v2:
> - Just reviewed-by pickups
>
> V2: https://lore.kernel.org/all/20230315170706.1598977-2-nm@ti.com/
> V1: https://lore.kernel.org/all/20230311105850.21811-2-nm@ti.com/
>
>  arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
> index 38dced6b4fef..fec81546fbbd 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
> @@ -40,4 +40,14 @@ wkup_i2c0: i2c@2b200000 {
>  		clock-names = "fck";
>  		status = "disabled";
>  	};
> +
> +	wkup_rtc0: rtc@2b1f0000 {
> +		compatible = "ti,am62-rtc";
> +		reg = <0x00 0x2b1f0000 0x00 0x100>;
> +		interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&k3_clks 117 6> , <&k3_clks 117 0>;
> +		clock-names = "vbus", "osc32k";
> +		power-domains = <&k3_pds 117 TI_SCI_PD_EXCLUSIVE>;
> +		wakeup-source;
> +	};
>  };

I was just wondering why some of the rtctests show failures on this platform:

https://gist.github.com/DhruvaG2000/5c6d8bb99b087308b916985d70f0c440

pass:5 fail:2

the test is compiled from tools/testing/selftests/rtc/rtctest.c for arm64 target

Is this expected?

-- 
Best regards,
Dhruva Gole
Texas Instruments Incorporated

Re: [PATCH V3 1/2] arm64: dts: ti: k3-am62-wakeup: Introduce RTC node

[Nishanth Menon]

On 10:07-20230321, Dhruva Gole wrote:
[...]

> 
> I was just wondering why some of the rtctests show failures on this platform:
> 
> https://gist.github.com/DhruvaG2000/5c6d8bb99b087308b916985d70f0c440
> 
> pass:5 fail:2
> 
> the test is compiled from tools/testing/selftests/rtc/rtctest.c for arm64 target
> 
> Is this expected?

I used the standard defconfig and [1] on beagleplay and
cross verified on 6.3-rc3 as well. It works fine. See logs below.

NOTE: BeaglePlay has a external 32k crystal that drives RTC and other
32k clock sources internal to the SoC. This helps maintain accurate
time. If your platform does'nt have an external 32k crystal OR AM62
does'nt enable 32k using MCU_CTRL_LFXOSC_CTRL[2], then default 32k RC
osc inside the SoC triggers. This internal clock is very variable.
There are a ton of stuff inside the SoC that depends on 32k, so this
wont be just a RTC specific behavior.

ti-next: (6.3-rc1)
ti-next + 6.3-rc3: (dirty is because of a rtctest Makefile mod to build
static)
https://gist.github.com/nmenon/e1b300652ac452ad55fa4cf936fc3e63


[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git/log/
[2] https://git.beagleboard.org/beagleplay/u-boot/-/blob/lc-ti-u-boot-2021.01/board/ti/am62x/evm.c#L243
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

[PATCH V3 2/2] arm64: dts: ti: k3-am62: Add watchdog nodes

[Nishanth Menon]

From: Julien Panis <jpanis@baylibre.com>

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

Signed-off-by: Julien Panis <jpanis@baylibre.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Changes since v2:
- s/main_rti4/main_rti15 to matchup with TRM naming convention
- Picked up reviewed by

V2: https://lore.kernel.org/all/20230315170706.1598977-3-nm@ti.com/
V1: https://lore.kernel.org/r/20230311105850.21811-3-nm@ti.com

 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   | 45 ++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    | 11 ++++++
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 11 ++++++
 3 files changed, 67 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index a143ea5e78a5..16e14863d7df 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -758,6 +758,51 @@ main_mcan0: can@20701000 {
 		status = "disabled";
 	};
 
+	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 a427231527c3..076601a41e84 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
@@ -130,4 +130,15 @@ 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>;
+		/* Tightly coupled to M4F */
+		status = "reserved";
+	};
 };
diff --git a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
index fec81546fbbd..7726ebae2539 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
@@ -50,4 +50,15 @@ wkup_rtc0: rtc@2b1f0000 {
 		power-domains = <&k3_pds 117 TI_SCI_PD_EXCLUSIVE>;
 		wakeup-source;
 	};
+
+	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>;
+		/* Used by DM firmware */
+		status = "reserved";
+	};
 };
-- 
2.40.0

Re: [PATCH V3 0/2] arm64: dts: ti: k3-am62: Add watchdog and rtc nodes

[Nishanth Menon]

Hi Nishanth Menon,

On Mon, 20 Mar 2023 11:51:21 -0500, Nishanth Menon wrote:
> Couple of Misc patches
> 
> Changes since v2:
>  - Picked up Reviewed-bys
>  - wdt node rename to match with TRM
> 
> V2: https://lore.kernel.org/all/20230315170706.1598977-1-nm@ti.com/
> V1: https://lore.kernel.org/all/20230311105850.21811-1-nm@ti.com/#t
> 
> [...]

I have applied the following to branch ti-k3-dts-next on [1].
Thank you!

[1/2] arm64: dts: ti: k3-am62-wakeup: Introduce RTC node
      commit: 0c51ceeebf04c388c06e29a2bb69855cd97f7c91
[2/2] arm64: dts: ti: k3-am62: Add watchdog nodes
      commit: 4eec5d77d330638dc8e79e25992420a78f2a3019

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

[1] git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D