michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: gpio: mchp: Fix pin configure after disconnect

Browse source 
GPIO driver properly disconnects a pin. On subsequent pin
configure calls the driver does not clear the GPIO pin's
power gate field resulting in the pin remaining disconnected.

Signed-off-by: Scott Worley <scott.worley@microchip.com>
This commit is contained in:
Scott Worley 2021-03-17 14:24:00 -04:00 • committed by Anas Nashif
commit dde796a1c9
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/gpio/gpio_mchp_xec.c
View file

@ -79,9 +79,11 @@ static int gpio_xec_configure(const struct device *dev,
* PCRs for a given GPIO. There are no GPIO modules in Microchip SOCs! * PCRs for a given GPIO. There are no GPIO modules in Microchip SOCs!
* Keep direction as input until last. * Keep direction as input until last.
* Clear input pad disable allowing input pad to operate. * Clear input pad disable allowing input pad to operate.
* Clear Power gate to allow pads to operate.
*/ */
mask |= MCHP_GPIO_CTRL_DIR_MASK; mask |= MCHP_GPIO_CTRL_DIR_MASK;
mask |= MCHP_GPIO_CTRL_INPAD_DIS_MASK; mask |= MCHP_GPIO_CTRL_INPAD_DIS_MASK;
mask |= MCHP_GPIO_CTRL_PWRG_MASK;
pcr1 |= MCHP_GPIO_CTRL_DIR_INPUT; pcr1 |= MCHP_GPIO_CTRL_DIR_INPUT;
/* Figure out the pullup/pulldown configuration and keep it in the /* Figure out the pullup/pulldown configuration and keep it in the
@ -114,6 +116,11 @@ static int gpio_xec_configure(const struct device *dev,
mask |= MCHP_GPIO_CTRL_AOD_MASK; mask |= MCHP_GPIO_CTRL_AOD_MASK;
pcr1 |= MCHP_GPIO_CTRL_AOD_DIS; pcr1 |= MCHP_GPIO_CTRL_AOD_DIS;
/* Make sure disconnected on first control register write */
if (flags == GPIO_DISCONNECTED) {
pcr1 |= MCHP_GPIO_CTRL_PWRG_OFF;
}
/* Now write contents of pcr1 variable to the PCR1 register that /* Now write contents of pcr1 variable to the PCR1 register that
* corresponds to the GPIO being configured. * corresponds to the GPIO being configured.
* AOD is 1 and direction is input. HW will allow use to set the * AOD is 1 and direction is input. HW will allow use to set the
@ -133,13 +140,6 @@ static int gpio_xec_configure(const struct device *dev,
mask = MCHP_GPIO_CTRL_DIR_MASK; mask = MCHP_GPIO_CTRL_DIR_MASK;
pcr1 = MCHP_GPIO_CTRL_DIR_OUTPUT; pcr1 = MCHP_GPIO_CTRL_DIR_OUTPUT;
*current_pcr1 = (*current_pcr1 & ~mask) | pcr1; *current_pcr1 = (*current_pcr1 & ~mask) | pcr1;
} else if ((flags & GPIO_INPUT) != 0U) {
/* Already configured */
} else {
/* GPIO disconnected */
mask |= MCHP_GPIO_CTRL_PWRG_MASK;
pcr1 |= MCHP_GPIO_CTRL_PWRG_OFF;
*current_pcr1 = (*current_pcr1 & ~mask) | pcr1;
} }
return 0; return 0;