drivers/pinctrl: it8xxx2: Modify the sequence of pinctrl setting

Modify the sequence of pinctrl setting. Default setting as input mode
prevents leakage during changes to extended setting.

Signed-off-by: Tim Lin <[email protected]>
Signed-off-by: Dino Li <[email protected]>

Author: Dino-Li

drivers/pinctrl/pinctrl_ite_it8xxx2.c

@@ -144,35 +144,36 @@ static int pinctrl_gpio_it8xxx2_configure_pins(const pinctrl_soc_pin_t *pins)
 		return -EINVAL;
 	}
 
+	/*
+	 * Default input mode prevents leakage during changes to extended
+	 * setting (e.g. enabling i2c functionality on GPIO E1/E2 on IT82002)
+	 */
+	*reg_gpcr = (*reg_gpcr | GPCR_PORT_PIN_MODE_INPUT) &
+		     ~GPCR_PORT_PIN_MODE_OUTPUT;
+
 	/*
 	 * If pincfg is input, we don't need to handle
 	 * alternate function.
 	 */
 	if (IT8XXX2_DT_PINCFG_INPUT(pins->pincfg)) {
-		*reg_gpcr = (*reg_gpcr | GPCR_PORT_PIN_MODE_INPUT) &
-			     ~GPCR_PORT_PIN_MODE_OUTPUT;
 		return 0;
 	}
 
 	/*
 	 * Handle alternate function.
 	 */
-	/* Common settings for alternate function. */
-	*reg_gpcr &= ~(GPCR_PORT_PIN_MODE_INPUT |
-		       GPCR_PORT_PIN_MODE_OUTPUT);
 	/* Ensure that func3-ext setting is in default state. */
 	if (reg_func3_ext != NULL) {
 		*reg_func3_ext &= ~gpio->func3_ext_mask[pin];
 	}
 
 	switch (pins->alt_func) {
 	case IT8XXX2_ALT_FUNC_1:
-		/* Func1: Alternate function has been set above. */
+		/* Func1: Alternate function will be set below. */
 		break;
 	case IT8XXX2_ALT_FUNC_2:
-		/* Func2: WUI function: turn the pin into an input */
-		*reg_gpcr |= GPCR_PORT_PIN_MODE_INPUT;
-		break;
+		/* Func2: WUI function: pin has been set as input above.*/
+		return 0;
 	case IT8XXX2_ALT_FUNC_3:
 		/*
 		 * Func3: In addition to the alternate setting above,
@@ -193,16 +194,18 @@ static int pinctrl_gpio_it8xxx2_configure_pins(const pinctrl_soc_pin_t *pins)
 		*reg_func4_gcr |= gpio->func4_en_mask[pin];
 		break;
 	case IT8XXX2_ALT_DEFAULT:
-		*reg_gpcr = (*reg_gpcr | GPCR_PORT_PIN_MODE_INPUT) &
-			     ~GPCR_PORT_PIN_MODE_OUTPUT;
 		*reg_func3_gcr &= ~gpio->func3_en_mask[pin];
 		*reg_func4_gcr &= ~gpio->func4_en_mask[pin];
-		break;
+		return 0;
 	default:
 		LOG_ERR("This function is not supported.");
 		return -EINVAL;
 	}
 
+	/* Common settings for alternate function. */
+	*reg_gpcr &= ~(GPCR_PORT_PIN_MODE_INPUT |
+		       GPCR_PORT_PIN_MODE_OUTPUT);
+
 	return 0;
 }