Skip to content

[nrf fromtree] dts: bindings: arm: nordic: Add TDDCONF sources #2039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2024
Merged

[nrf fromtree] dts: bindings: arm: nordic: Add TDDCONF sources #2039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c10e50e
[nrf fromtree] dts: bindings: arm: nordic: Add TDDCONF sources
karstenkoenig Sep 19, 2024
504140f
[nrf noup] modules: hal_nordic: Drop EXACT nrf-regtool check
karstenkoenig Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions dts/bindings/arm/nordic,nrf-tddconf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,27 @@ compatible: "nordic,nrf-tddconf"
include: base.yaml

properties:
stmsink:
type: string
description: indicates the sink for STM data
enum:
- "etr"
- "tpiu"
# - "etb" - Not supported yet
etbsources:
type: int
description: |
Bitmask of enabled sources for the ETB sink. Valid values can be found in
dt-bindings/misc/nordic-tddconf.h

tpiusources:
type: int
description: |
Bitmask of enabled sources for the TPIU sink. Valid values can be found in
dt-bindings/misc/nordic-tddconf.h

etrsources:
type: int
description: |
Bitmask of enabled sources for the ETR sink. Valid values can be found in
dt-bindings/misc/nordic-tddconf.h

portconfig:
type: int
default: 3
description: TPIU clock divider - TDD HSFLL / 2^(2 + portconfig)
enum:
- 0
Expand Down
1 change: 1 addition & 0 deletions dts/common/nordic/nrf54h20.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <zephyr/dt-bindings/misc/nordic-nrf-ficr-nrf54h20.h>
#include <zephyr/dt-bindings/misc/nordic-domain-id-nrf54h20.h>
#include <zephyr/dt-bindings/misc/nordic-owner-id-nrf54h20.h>
#include <zephyr/dt-bindings/misc/nordic-tddconf.h>

/delete-node/ &sw_pwm;

Expand Down
14 changes: 14 additions & 0 deletions include/zephyr/dt-bindings/misc/nordic-tddconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
* SPDX-License-Identifier: Apache-2.0
*/

#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_MISC_NORDIC_TDDCONF_H_

#define NRF_TDDCONF_SOURCE_STMMAINCORE BIT(0)
#define NRF_TDDCONF_SOURCE_ETMMAINCORE BIT(1)
#define NRF_TDDCONF_SOURCE_STMHWEVENTS BIT(2)
#define NRF_TDDCONF_SOURCE_STMPPR BIT(3)
#define NRF_TDDCONF_SOURCE_STMFLPR BIT(4)

#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_MISC_NORDIC_TDDCONF_H_ */
2 changes: 1 addition & 1 deletion modules/hal_nordic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if(CONFIG_NRF_REGTOOL_GENERATE_BICR)
list(APPEND nrf_regtool_components GENERATE:BICR)
endif()
if(DEFINED nrf_regtool_components)
find_package(nrf-regtool 5.6.0 EXACT REQUIRED
find_package(nrf-regtool 5.6.0 REQUIRED
COMPONENTS ${nrf_regtool_components}
PATHS ${CMAKE_CURRENT_LIST_DIR}/nrf-regtool
NO_CMAKE_PATH
Expand Down
3 changes: 2 additions & 1 deletion snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

&tddconf {
status = "okay";
stmsink = "etr";
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
NRF_TDDCONF_SOURCE_STMFLPR)>;
portconfig = <0>;
};
9 changes: 9 additions & 0 deletions snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* Copyright (c) 2024 Nordic Semiconductor
* SPDX-License-Identifier: Apache-2.0
*/

&tddconf {
status = "okay";
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
};
3 changes: 3 additions & 0 deletions snippets/nordic-log-stm-dict/snippet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ boards:
append:
EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
/.*/nrf54h20/cpurad/:
append:
EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay
3 changes: 2 additions & 1 deletion snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

&tddconf {
status = "okay";
stmsink = "etr";
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
NRF_TDDCONF_SOURCE_STMFLPR)>;
portconfig = <0>;
};
9 changes: 9 additions & 0 deletions snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* Copyright (c) 2024 Nordic Semiconductor
* SPDX-License-Identifier: Apache-2.0
*/

&tddconf {
status = "okay";
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
};
3 changes: 3 additions & 0 deletions snippets/nordic-log-stm/snippet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ boards:
append:
EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpuapp.overlay
EXTRA_CONF_FILE: boards/nrf54h20_cpuapp.conf
/.*/nrf54h20/cpurad/:
append:
EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20_cpurad.overlay
Loading