drivers: pinctrl: gecko: Fix Series 2 I2C location config

Series 2 uses DBUS for alternate function control, which directly uses
port and pin numbers for location selection. Configure pinout as part
of the I2C_SDA/I2C_SCL case, rather than the separate _LOC case,
as the port and pin are not available at this point.

Configure route register prior to enabling the route, to ensure that
the wrong pin is not temporarily claimed.

Fixes an issue where DBUS was always configured to port A and
pin given by the GECKO_LOC() macro, rather than the correct port/pin
pair.

Signed-off-by: Aksel Skauge Mellbye <[email protected]>

Author: asmellby

drivers/pinctrl/pinctrl_gecko.c

@@ -289,26 +289,34 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 			GPIO_PinModeSet(pin_config.port, pin_config.pin, pin_config.mode,
 				pin_config.out);
 
+#if defined(GPIO_I2C_ROUTEEN_SDAPEN)
+			GPIO->I2CROUTE[I2C_NUM(i2c_base)].SDAROUTE =
+				(pin_config.pin << _GPIO_I2C_SDAROUTE_PIN_SHIFT) |
+				(pin_config.port << _GPIO_I2C_SDAROUTE_PORT_SHIFT);
+			GPIO->I2CROUTE[I2C_NUM(i2c_base)].ROUTEEN |= GPIO_I2C_ROUTEEN_SDAPEN;
+#endif
 			break;
 
 		case GECKO_FUN_I2C_SCL:
 			pin_config.mode = gpioModeWiredAnd;
 			pin_config.out = 1;
 			GPIO_PinModeSet(pin_config.port, pin_config.pin, pin_config.mode,
 				pin_config.out);
+
+#if defined(GPIO_I2C_ROUTEEN_SCLPEN)
+			GPIO->I2CROUTE[I2C_NUM(i2c_base)].SCLROUTE =
+				(pin_config.pin << _GPIO_I2C_SCLROUTE_PIN_SHIFT) |
+				(pin_config.port << _GPIO_I2C_SCLROUTE_PORT_SHIFT);
+			GPIO->I2CROUTE[I2C_NUM(i2c_base)].ROUTEEN |= GPIO_I2C_ROUTEEN_SCLPEN;
+#endif
 			break;
 
 		case GECKO_FUN_I2C_SDA_LOC:
 #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
 			i2c_base->ROUTEPEN |= I2C_ROUTEPEN_SDAPEN;
 			i2c_base->ROUTELOC0 &= ~_I2C_ROUTELOC0_SDALOC_MASK;
 			i2c_base->ROUTELOC0 |= (loc << _I2C_ROUTELOC0_SDALOC_SHIFT);
-#elif defined(GPIO_I2C_ROUTEEN_SCLPEN) && defined(GPIO_I2C_ROUTEEN_SDAPEN)
-			GPIO->I2CROUTE[I2C_NUM(i2c_base)].ROUTEEN |= GPIO_I2C_ROUTEEN_SDAPEN;
-			GPIO->I2CROUTE[I2C_NUM(i2c_base)].SDAROUTE =
-				(pin_config.pin << _GPIO_I2C_SDAROUTE_PIN_SHIFT) |
-				(pin_config.port << _GPIO_I2C_SDAROUTE_PORT_SHIFT);
-#else
+#elif defined(I2C_ROUTE_SDAPEN)
 			i2c_base->ROUTE = I2C_ROUTE_SDAPEN | I2C_ROUTE_SCLPEN | (loc << 8);
 #endif
 			break;
@@ -318,12 +326,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 			i2c_base->ROUTEPEN |= I2C_ROUTEPEN_SCLPEN;
 			i2c_base->ROUTELOC0 &= ~_I2C_ROUTEPEN_SCLPEN_MASK;
 			i2c_base->ROUTELOC0 |= (loc << _I2C_ROUTELOC0_SCLLOC_SHIFT);
-#elif defined(GPIO_I2C_ROUTEEN_SCLPEN) && defined(GPIO_I2C_ROUTEEN_SDAPEN)
-			GPIO->I2CROUTE[I2C_NUM(i2c_base)].ROUTEEN |= GPIO_I2C_ROUTEEN_SCLPEN;
-			GPIO->I2CROUTE[I2C_NUM(i2c_base)].SCLROUTE =
-				(pin_config.pin << _GPIO_I2C_SCLROUTE_PIN_SHIFT) |
-				(pin_config.port << _GPIO_I2C_SCLROUTE_PORT_SHIFT);
-#else
+#elif defined(I2C_ROUTE_SCLPEN)
 			i2c_base->ROUTE = I2C_ROUTE_SDAPEN | I2C_ROUTE_SCLPEN | (loc << 8);
 #endif
 			break;