Skip to content

[Backport ncs-v3.2-branch] [nrf fromlist] soc: nordic: uicr: fix pin function ignore handling in… #3619

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

Open
github-actions wants to merge 1 commit into
base: ncs-v3.2-branch
Choose a base branch
from
Open

[Backport ncs-v3.2-branch] [nrf fromlist] soc: nordic: uicr: fix pin function ignore handling in… #3619

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: 5 additions & 3 deletions soc/nordic/common/uicr/periphconf/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,19 +1116,21 @@ def lookup_ctrlsel_for_property(self, prop: Property, psel: tuple[int, int]) ->

def lookup_ctrlsel_for_pinctrl(self, prop: PinCtrl, psel: NrfPsel) -> Ctrlsel | None:
"""Find the appopriate CTRLSEL value for a given pinctrl."""
ctrlsel_default = None
if psel.fun == NrfFun.ASSUMED_GPIO:
# We map unsupported values to GPIO CTRLSEL
return CTRLSEL_DEFAULT
ctrlsel_default = CTRLSEL_DEFAULT

periph_addr = dt_reg_addr(prop.node, secure=True)
return self._lookup_ctrlsel(periph_addr, psel)
return self._lookup_ctrlsel(periph_addr, psel, ctrlsel_default=ctrlsel_default)

def _lookup_ctrlsel(
self,
periph_addr: int,
prop_or_psel: NrfPsel | GpiosProp,
ctrlsel_default: Ctrlsel | None = None,
) -> Ctrlsel | None:
ctrlsel = None
ctrlsel = ctrlsel_default

if periph_addr in self.ctrlsel_lookup:
ident_lut = self.ctrlsel_lookup[periph_addr]
Expand Down
Loading