Skip to content

Commit 73d0fd5

Browse files
committed
[nrf fromlist] soc: nordic: nrf54h: Allow using NFCT pins as gpios on cpurad
NFCT is by default assigned to application so DT node does not need to be enabled or reserved in DT to have access to NFCT registers. On cpurad NFCT must be reserved to enable register access and then antenna pins can be configured as gpios. Upstream PR #: 91274 Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent c19be52 commit 73d0fd5

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

dts/arm/nordic/nrf54h20_cpuapp.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,3 @@ wdt011: &cpuapp_wdt011 {};
5959
&grtc {
6060
interrupts = <109 NRF_DEFAULT_IRQ_PRIORITY>;
6161
};
62-
63-
&nfct {
64-
compatible = "nordic,nrf-nfct-v2";
65-
};

dts/common/nordic/nrf54h20.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@
927927
};
928928

929929
nfct: nfct@985000 {
930-
compatible = "nordic,nrf-nfct";
930+
compatible = "nordic,nrf-nfct-v2";
931931
reg = <0x985000 0x1000>;
932932
status = "disabled";
933933
interrupts = <389 NRF_DEFAULT_IRQ_PRIORITY>;

soc/nordic/nrf54h/soc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ void soc_early_init_hook(void)
153153
nrf_spu_periph_perm_dmasec_set(spu, nrf_address_slave_get(ccm030_addr), true);
154154
#endif
155155

156-
if (DT_NODE_HAS_STATUS(DT_NODELABEL(nfct), disabled) &&
156+
if (((IS_ENABLED(CONFIG_SOC_NRF54H20_CPUAPP) &&
157+
DT_NODE_HAS_STATUS(DT_NODELABEL(nfct), disabled)) ||
158+
DT_NODE_HAS_STATUS(DT_NODELABEL(nfct), reserved)) &&
157159
DT_PROP_OR(DT_NODELABEL(nfct), nfct_pins_as_gpios, 0)) {
158160
nrf_nfct_pad_config_enable_set(NRF_NFCT, false);
159161
}

0 commit comments

Comments
 (0)