espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

gpio driver: Clear GPIO matrix output config when setting pin as input

Browse Source 
Otherwise, if a non-GPIO peripheral has been routed to this pin
(as an output), output driver can remain enabled.
This commit is contained in:
Angus Gratton
2017-06-26 12:41:40 +10:00
committed by Angus Gratton
parent 3bd3640d60
commit 17747b3358
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/driver/gpio.c
View File

@ -164,6 +164,11 @@ static esp_err_t gpio_output_disable(gpio_num_t gpio_num)
} else { } else {
GPIO.enable1_w1tc.data = (0x1 << (gpio_num - 32)); GPIO.enable1_w1tc.data = (0x1 << (gpio_num - 32));
} }
// Ensure no other output signal is routed via GPIO matrix to this pin
REG_WRITE(GPIO_FUNC0_OUT_SEL_CFG_REG + (gpio_num * 4),
SIG_GPIO_OUT_IDX);
return ESP_OK; return ESP_OK;
} }
@ -175,6 +180,7 @@ static esp_err_t gpio_output_enable(gpio_num_t gpio_num)
} else { } else {
GPIO.enable1_w1ts.data = (0x1 << (gpio_num - 32)); GPIO.enable1_w1ts.data = (0x1 << (gpio_num - 32));
} }
gpio_matrix_out(gpio_num, SIG_GPIO_OUT_IDX, false, false);
return ESP_OK; return ESP_OK;
} }
@ -250,17 +256,9 @@ esp_err_t gpio_set_direction(gpio_num_t gpio_num, gpio_mode_t mode)
PIN_INPUT_DISABLE(GPIO_PIN_MUX_REG[gpio_num]); PIN_INPUT_DISABLE(GPIO_PIN_MUX_REG[gpio_num]);
} }
if (mode & GPIO_MODE_DEF_OUTPUT) { if (mode & GPIO_MODE_DEF_OUTPUT) {
if (gpio_num < 32) { gpio_output_enable(gpio_num);
GPIO.enable_w1ts = (0x1 << gpio_num);
} else {
GPIO.enable1_w1ts.data = (0x1 << (gpio_num - 32));
}
} else { } else {
if (gpio_num < 32) { gpio_output_disable(gpio_num);
GPIO.enable_w1tc = (0x1 << gpio_num);
} else {
GPIO.enable1_w1tc.data = (0x1 << (gpio_num - 32));
}
} }
if (mode & GPIO_MODE_DEF_OD) { if (mode & GPIO_MODE_DEF_OD) {
GPIO.pin[gpio_num].pad_driver = 1; GPIO.pin[gpio_num].pad_driver = 1;
@ -311,7 +309,6 @@ esp_err_t gpio_config(const gpio_config_t *pGPIOConfig)
} }
if ((pGPIOConfig->mode) & GPIO_MODE_DEF_OUTPUT) { if ((pGPIOConfig->mode) & GPIO_MODE_DEF_OUTPUT) {
output_en = 1; output_en = 1;
gpio_matrix_out(io_num, SIG_GPIO_OUT_IDX, 0, 0);
gpio_output_enable(io_num); gpio_output_enable(io_num);
} else { } else {
gpio_output_disable(io_num); gpio_output_disable(io_num);