Skip to content

[nrf fromlist] drivers: pinctrl: nrf: use HAL defines #3347

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
Oct 2, 2025
Merged

[nrf fromlist] drivers: pinctrl: nrf: use HAL defines #3347

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
8 changes: 4 additions & 4 deletions drivers/pinctrl/pinctrl_nrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
(NRF_PULL_UP == NRF_GPIO_PIN_PULLUP)),
"nRF pinctrl pull settings do not match HAL values");

#if defined(GPIO_PIN_CNF_DRIVE_E0E1) || defined(GPIO_PIN_CNF_DRIVE0_E0)
#if NRF_GPIO_HAS_DRIVE_EXTRA
#define NRF_DRIVE_COUNT (NRF_DRIVE_E0E1 + 1)
#else
#define NRF_DRIVE_COUNT (NRF_DRIVE_H0D1 + 1)
Expand All @@ -29,7 +29,7 @@
[NRF_DRIVE_D0H1] = NRF_GPIO_PIN_D0H1,
[NRF_DRIVE_S0D1] = NRF_GPIO_PIN_S0D1,
[NRF_DRIVE_H0D1] = NRF_GPIO_PIN_H0D1,
#if defined(GPIO_PIN_CNF_DRIVE_E0E1) || defined(GPIO_PIN_CNF_DRIVE0_E0)
#if NRF_GPIO_HAS_DRIVE_EXTRA

Check notice on line 32 in drivers/pinctrl/pinctrl_nrf.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/pinctrl/pinctrl_nrf.c:32 
-	[NRF_DRIVE_S0S1] = NRF_GPIO_PIN_S0S1,
-	[NRF_DRIVE_H0S1] = NRF_GPIO_PIN_H0S1,
-	[NRF_DRIVE_S0H1] = NRF_GPIO_PIN_S0H1,
-	[NRF_DRIVE_H0H1] = NRF_GPIO_PIN_H0H1,
-	[NRF_DRIVE_D0S1] = NRF_GPIO_PIN_D0S1,
-	[NRF_DRIVE_D0H1] = NRF_GPIO_PIN_D0H1,
-	[NRF_DRIVE_S0D1] = NRF_GPIO_PIN_S0D1,
-	[NRF_DRIVE_H0D1] = NRF_GPIO_PIN_H0D1,
+	[NRF_DRIVE_S0S1] = NRF_GPIO_PIN_S0S1, [NRF_DRIVE_H0S1] = NRF_GPIO_PIN_H0S1,
+	[NRF_DRIVE_S0H1] = NRF_GPIO_PIN_S0H1, [NRF_DRIVE_H0H1] = NRF_GPIO_PIN_H0H1,
+	[NRF_DRIVE_D0S1] = NRF_GPIO_PIN_D0S1, [NRF_DRIVE_D0H1] = NRF_GPIO_PIN_D0H1,
+	[NRF_DRIVE_S0D1] = NRF_GPIO_PIN_S0D1, [NRF_DRIVE_H0D1] = NRF_GPIO_PIN_H0D1,
[NRF_DRIVE_E0E1] = NRF_GPIO_PIN_E0E1,
#endif
};
Expand Down Expand Up @@ -498,7 +498,7 @@
#endif /* defined(NRF_PSEL_TDM) */
#if defined(NRF_GRTC_CLKOUT_FAST)
case NRF_FUN_GRTC_CLKOUT_FAST:
#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
#if NRF_GPIO_HAS_SEL && NRF_GPIO_HAS_CTRLSEL_GRTC
nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
#endif
dir = NRF_GPIO_PIN_DIR_OUTPUT;
Expand All @@ -507,7 +507,7 @@
#endif /* defined(NRF_GRTC_CLKOUT_FAST) */
#if defined(NRF_GRTC_CLKOUT_SLOW)
case NRF_FUN_GRTC_CLKOUT_32K:
#if NRF_GPIO_HAS_SEL && defined(GPIO_PIN_CNF_CTRLSEL_GRTC)
#if NRF_GPIO_HAS_SEL && NRF_GPIO_HAS_CTRLSEL_GRTC
nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_GRTC);
#endif
dir = NRF_GPIO_PIN_DIR_OUTPUT;
Expand Down
Loading