From 41f492441e7bec8a4451b4ecff8ec0a393b27bbb Mon Sep 17 00:00:00 2001 From: Hou Zhiqiang Date: Fri, 18 Oct 2024 01:28:22 +0800 Subject: [PATCH 1/5] dts: arm64: imx95: add TPM device nodes Added TPM device tree nodes for i.MX95 CA55. Signed-off-by: Hou Zhiqiang --- dts/arm64/nxp/nxp_mimx95_a55.dtsi | 66 +++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dts/arm64/nxp/nxp_mimx95_a55.dtsi b/dts/arm64/nxp/nxp_mimx95_a55.dtsi index 728539e2205e46..a5edbd0f87e0aa 100644 --- a/dts/arm64/nxp/nxp_mimx95_a55.dtsi +++ b/dts/arm64/nxp/nxp_mimx95_a55.dtsi @@ -239,4 +239,70 @@ #mbox-cells = <1>; status = "disabled"; }; + + tpm1: tpm@44310000 { + compatible = "nxp,tpm-timer"; + reg = <0x44310000 DT_SIZE_K(64)>; + interrupts = ; + interrupt-names = "irq_0"; + interrupt-parent = <&gic>; + clocks = <&scmi_clk IMX95_CLK_BUSAON>; + prescaler = <1>; + status = "disabled"; + }; + + tpm2: tpm@44320000 { + compatible = "nxp,tpm-timer"; + reg = <0x44320000 DT_SIZE_K(64)>; + interrupts = ; + interrupt-names = "irq_0"; + interrupt-parent = <&gic>; + clocks = <&scmi_clk IMX95_CLK_TPM2>; + prescaler = <1>; + status = "disabled"; + }; + + tpm3: tpm@424e0000 { + compatible = "nxp,tpm-timer"; + reg = <0x424e0000 DT_SIZE_K(64)>; + interrupts = ; + interrupt-names = "irq_0"; + interrupt-parent = <&gic>; + clocks = <&scmi_clk IMX95_CLK_BUSWAKEUP>; + prescaler = <1>; + status = "disabled"; + }; + + tpm4: tpm@424f0000 { + compatible = "nxp,tpm-timer"; + reg = <0x424f0000 DT_SIZE_K(64)>; + interrupts = ; + interrupt-names = "irq_0"; + interrupt-parent = <&gic>; + clocks = <&scmi_clk IMX95_CLK_TPM4>; + prescaler = <1>; + status = "disabled"; + }; + + tpm5: tpm@42500000 { + compatible = "nxp,tpm-timer"; + reg = <0x42500000 DT_SIZE_K(64)>; + interrupts = ; + interrupt-names = "irq_0"; + interrupt-parent = <&gic>; + clocks = <&scmi_clk IMX95_CLK_TPM5>; + prescaler = <1>; + status = "disabled"; + }; + + tpm6: tpm@42510000 { + compatible = "nxp,tpm-timer"; + reg = <0x42510000 DT_SIZE_K(64)>; + interrupts = ; + interrupt-names = "irq_0"; + interrupt-parent = <&gic>; + clocks = <&scmi_clk IMX95_CLK_TPM6>; + prescaler = <1>; + status = "disabled"; + }; }; From ba561f3e235901180ad87595f3027701a1dfb26a Mon Sep 17 00:00:00 2001 From: Hou Zhiqiang Date: Thu, 7 Nov 2024 13:10:50 +0800 Subject: [PATCH 2/5] boards: imx95: add TPM support in CA55 feature table Add TPM counter feature in i.MX95 CA55 doc. Signed-off-by: Hou Zhiqiang --- boards/nxp/imx95_evk/doc/index.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boards/nxp/imx95_evk/doc/index.rst b/boards/nxp/imx95_evk/doc/index.rst index 1acf8cc536f5da..20c3ab16a167ce 100644 --- a/boards/nxp/imx95_evk/doc/index.rst +++ b/boards/nxp/imx95_evk/doc/index.rst @@ -109,6 +109,8 @@ the following hardware features: +-----------+------------+-------------------------------------+ | UART | on-chip | serial port | +-----------+------------+-------------------------------------+ +| TPM | on-chip | tpm | ++-----------+------------+-------------------------------------+ System Clock ------------ From 4b971103d492397a91ee4676522c1817d723df27 Mon Sep 17 00:00:00 2001 From: Hou Zhiqiang Date: Mon, 25 Nov 2024 22:59:12 +0800 Subject: [PATCH 3/5] boards: imx95: add counter to support list of CA55 yaml Update the yaml files of i.MX 95 CA55 and SMP CA55 variant to add TPM counter to support list. Signed-off-by: Hou Zhiqiang --- boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml | 1 + boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml index c1183ca216ac5e..410193135e8075 100644 --- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml +++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55.yaml @@ -14,4 +14,5 @@ toolchain: ram: 1024 supported: - uart + - counter vendor: nxp diff --git a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml index 210f5f3278ac75..33f570bd53ade9 100644 --- a/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml +++ b/boards/nxp/imx95_evk/imx95_evk_mimx9596_a55_smp.yaml @@ -15,4 +15,5 @@ ram: 1024 supported: - smp - uart + - counter vendor: nxp From 406c7d9dc32534dee213c4e4fd4189bf9fb125f8 Mon Sep 17 00:00:00 2001 From: Hou Zhiqiang Date: Thu, 7 Nov 2024 13:29:26 +0800 Subject: [PATCH 4/5] tests: counter_basic_api: add imx95 evk support Add i.MX 95 EVK support for counter_basic_api test application. Signed-off-by: Hou Zhiqiang --- .../boards/imx95_evk_mimx9596_a55.overlay | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 tests/drivers/counter/counter_basic_api/boards/imx95_evk_mimx9596_a55.overlay diff --git a/tests/drivers/counter/counter_basic_api/boards/imx95_evk_mimx9596_a55.overlay b/tests/drivers/counter/counter_basic_api/boards/imx95_evk_mimx9596_a55.overlay new file mode 100644 index 00000000000000..e20242c8b05e4b --- /dev/null +++ b/tests/drivers/counter/counter_basic_api/boards/imx95_evk_mimx9596_a55.overlay @@ -0,0 +1,9 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&tpm2 { + status = "okay"; +}; From 5dbd93613605bede1bbb0923b2265b9367cd1b94 Mon Sep 17 00:00:00 2001 From: Hou Zhiqiang Date: Thu, 5 Dec 2024 14:57:24 +0800 Subject: [PATCH 5/5] west.yml: update hal_nxp reversion Update the hal_nxp to the depended pull request. Signed-off-by: Hou Zhiqiang --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 1bb34648e0eccd..82b2b88e3acfa0 100644 --- a/west.yml +++ b/west.yml @@ -203,7 +203,7 @@ manifest: groups: - hal - name: hal_nxp - revision: dad9b28b80c68c4e124dd3a61eb3821df387bf0e + revision: a7dc61f89063c1008f24ee21575c68d0165de91b path: modules/hal/nxp groups: - hal