Skip to content

Commit bd990c5

Browse files
mstasiaknordicrlubos
authored andcommitted
[nrf fromlist] drivers: Extend analog pins mapping for nRF54L.
Extended analog pins mappings for more nRF54L targets. Upstream PR #: 91581 Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no>
1 parent 68ab1cf commit bd990c5

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

drivers/adc/adc_nrfx_saadc.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
5454
[NRF_SAADC_AVDD] = NRF_SAADC_INPUT_AVDD,
5555
[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,
5656
};
57-
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
57+
#elif defined(NRF54LM20A_ENGA_XXAA)
5858
static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
5959
[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
6060
[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(31U, 1),
@@ -65,9 +65,20 @@ static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
6565
[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
6666
[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
6767
[NRF_SAADC_VDD] = NRF_SAADC_INPUT_VDD,
68-
#if defined(NRF_SAADC_INPUT_AVDD)
6968
[NRF_SAADC_AVDD] = NRF_SAADC_INPUT_AVDD,
70-
#endif
69+
[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,
70+
};
71+
#elif defined(NRF54LV10A_ENGA_XXAA)
72+
static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
73+
[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
74+
[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
75+
[NRF_SAADC_AIN2] = NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
76+
[NRF_SAADC_AIN3] = NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
77+
[NRF_SAADC_AIN4] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
78+
[NRF_SAADC_AIN5] = NRF_PIN_PORT_TO_PIN_NUMBER(10U, 1),
79+
[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
80+
[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
81+
[NRF_SAADC_VDD] = NRF_SAADC_INPUT_VDD,
7182
[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,
7283
};
7384
#endif

drivers/comparator/comparator_nrf_common.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static const uint32_t shim_nrf_comp_ain_map[] = {
2828
NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
2929
NRF_PIN_PORT_TO_PIN_NUMBER(13U, 1),
3030
NRF_PIN_PORT_TO_PIN_NUMBER(14U, 1),
31-
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
31+
#elif defined(NRF54LM20A_ENGA_XXAA)
3232
NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
3333
NRF_PIN_PORT_TO_PIN_NUMBER(31U, 1),
3434
NRF_PIN_PORT_TO_PIN_NUMBER(30U, 1),
@@ -37,6 +37,15 @@ static const uint32_t shim_nrf_comp_ain_map[] = {
3737
NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
3838
NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
3939
NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
40+
#elif defined(NRF54LV10A_ENGA_XXAA)
41+
NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
42+
NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
43+
NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
44+
NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
45+
NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
46+
NRF_PIN_PORT_TO_PIN_NUMBER(10U, 1),
47+
NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
48+
NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
4049
#endif
4150
};
4251
#endif

0 commit comments

Comments
 (0)