Skip to content

[nrf fromlist] soc: nordic: common: Fix HAS_HW_NRF_NFCT condition #2942

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

Closed
wants to merge 2 commits into from
Closed

[nrf fromlist] soc: nordic: common: Fix HAS_HW_NRF_NFCT condition #2942

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
c19be52
[nrf fromlist] soc: nordic: common: Fix HAS_HW_NRF_NFCT condition
nordic-krch Jun 9, 2025
73d0fd5
[nrf fromlist] soc: nordic: nrf54h: Allow using NFCT pins as gpios on…
nordic-krch Jun 10, 2025
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
4 changes: 0 additions & 4 deletions dts/arm/nordic/nrf54h20_cpuapp.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,3 @@ wdt011: &cpuapp_wdt011 {};
&grtc {
interrupts = <109 NRF_DEFAULT_IRQ_PRIORITY>;
};

&nfct {
compatible = "nordic,nrf-nfct-v2";
};
2 changes: 1 addition & 1 deletion dts/common/nordic/nrf54h20.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@
};

nfct: nfct@985000 {
compatible = "nordic,nrf-nfct";
compatible = "nordic,nrf-nfct-v2";
reg = <0x985000 0x1000>;
status = "disabled";
interrupts = <389 NRF_DEFAULT_IRQ_PRIORITY>;
Expand Down
3 changes: 2 additions & 1 deletion soc/nordic/common/Kconfig.peripherals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ config HAS_HW_NRF_MWU
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_MWU))

config HAS_HW_NRF_NFCT
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_NFCT))
def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_NFCT)) || \
$(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_NFCT_V2))

config HAS_HW_NRF_NVMC_PE
def_bool $(dt_nodelabel_bool_prop,flash_controller,partial-erase)
Expand Down
4 changes: 3 additions & 1 deletion soc/nordic/nrf54h/soc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ void soc_early_init_hook(void)
nrf_spu_periph_perm_dmasec_set(spu, nrf_address_slave_get(ccm030_addr), true);
#endif

if (DT_NODE_HAS_STATUS(DT_NODELABEL(nfct), disabled) &&
if (((IS_ENABLED(CONFIG_SOC_NRF54H20_CPUAPP) &&
DT_NODE_HAS_STATUS(DT_NODELABEL(nfct), disabled)) ||
DT_NODE_HAS_STATUS(DT_NODELABEL(nfct), reserved)) &&
DT_PROP_OR(DT_NODELABEL(nfct), nfct_pins_as_gpios, 0)) {
nrf_nfct_pad_config_enable_set(NRF_NFCT, false);
}
Expand Down