Skip to content

[nrf fromlist] drivers: Extend analog pins mapping for nRF54L. #2953

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 1 commit into from
Jun 16, 2025
+24 −4
Merged

[nrf fromlist] drivers: Extend analog pins mapping for nRF54L. #2953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions drivers/adc/adc_nrfx_saadc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
[NRF_SAADC_AVDD] = NRF_SAADC_INPUT_AVDD,
[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,
};
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#elif defined(NRF54LM20A_ENGA_XXAA)
static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(31U, 1),
Expand All @@ -65,10 +65,21 @@
[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
[NRF_SAADC_VDD] = NRF_SAADC_INPUT_VDD,
#if defined(NRF_SAADC_INPUT_AVDD)
[NRF_SAADC_AVDD] = NRF_SAADC_INPUT_AVDD,

Check notice on line 68 in drivers/adc/adc_nrfx_saadc.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/adc/adc_nrfx_saadc.c:68 
-	[NRF_SAADC_VDD]  = NRF_SAADC_INPUT_VDD,
+	[NRF_SAADC_VDD] = NRF_SAADC_INPUT_VDD,
#endif
[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,
};
#elif defined(NRF54LV10A_ENGA_XXAA)
static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
[NRF_SAADC_AIN2] = NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
[NRF_SAADC_AIN3] = NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
[NRF_SAADC_AIN4] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
[NRF_SAADC_AIN5] = NRF_PIN_PORT_TO_PIN_NUMBER(10U, 1),
[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
[NRF_SAADC_VDD] = NRF_SAADC_INPUT_VDD,
[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,

Check notice on line 82 in drivers/adc/adc_nrfx_saadc.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/adc/adc_nrfx_saadc.c:82 
-	[NRF_SAADC_VDD]  = NRF_SAADC_INPUT_VDD,
+	[NRF_SAADC_VDD] = NRF_SAADC_INPUT_VDD,
};
#endif

Expand Down
11 changes: 10 additions & 1 deletion drivers/comparator/comparator_nrf_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(13U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(14U, 1),
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#elif defined(NRF54LM20A_ENGA_XXAA)
NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(31U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(30U, 1),
Expand All @@ -37,7 +37,16 @@
NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
#elif defined(NRF54LV10A_ENGA_XXAA)
NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(10U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
#endif

Check notice on line 49 in drivers/comparator/comparator_nrf_common.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/comparator/comparator_nrf_common.h:49 
-	NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(31U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(30U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(29U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),  NRF_PIN_PORT_TO_PIN_NUMBER(31U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(30U, 1), NRF_PIN_PORT_TO_PIN_NUMBER(29U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),  NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),  NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
 #elif defined(NRF54LV10A_ENGA_XXAA)
-	NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(10U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
-	NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),  NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(2U, 1),  NRF_PIN_PORT_TO_PIN_NUMBER(3U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),  NRF_PIN_PORT_TO_PIN_NUMBER(10U, 1),
+	NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1), NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
};
#endif

Expand Down
Loading