[nrf fromlist] soc: nordic: uicr: fix pin function ignore handling in CTRLSEL lookup

Upstream PR #: 100579

Selecting the correct CTRLSEL value for VPR IO pins relies on
mapping any pinctrl psel value with the correct port/pin set on the
VPR nodes in devicetree to the same CTRLSEL value, to avoid enumerating
all permutations of (pin function, port, pin).

However, the mechanism did not work as intended and ended up mapping all
these pins to GPIO instead, which meant that the pins did not behave
as expected.

Update the handling so that it works as intended.

Signed-off-by: Jonathan Nilsen <[email protected]>

Author: jonathannilsen

soc/nordic/common/uicr/periphconf/builder.py

@@ -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]