You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2020/10/08 00:29:08 UTC
[incubator-nuttx] 01/02: arch/xtensa/src/esp32/esp32_psram.c: Adapt
configgpio to the latest change.
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0fdf9c7368fc29acc672fdf70fdf5d260340d19b
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Thu Oct 8 00:47:12 2020 +0100
arch/xtensa/src/esp32/esp32_psram.c: Adapt configgpio to the latest
change.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/xtensa/src/esp32/esp32_psram.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/xtensa/src/esp32/esp32_psram.c b/arch/xtensa/src/esp32/esp32_psram.c
index 9c28c9d..d22c56f 100644
--- a/arch/xtensa/src/esp32/esp32_psram.c
+++ b/arch/xtensa/src/esp32/esp32_psram.c
@@ -1191,24 +1191,24 @@ static void IRAM_ATTR psram_gpio_config(psram_io_t *psram_io,
{
/* flash clock signal should come from IO MUX. */
- esp32_configgpio(psram_io->flash_clk_io, OUTPUT_FUNCTION_1);
+ esp32_configgpio(psram_io->flash_clk_io, OUTPUT_FUNCTION_2);
}
else
{
/* flash clock signal should come from GPIO matrix. */
- esp32_configgpio(psram_io->flash_clk_io, OUTPUT_FUNCTION_2);
+ esp32_configgpio(psram_io->flash_clk_io, OUTPUT_FUNCTION_3);
}
- esp32_configgpio(psram_io->flash_cs_io, OUTPUT | FUNCTION_2);
- esp32_configgpio(psram_io->psram_cs_io, OUTPUT | FUNCTION_2);
- esp32_configgpio(psram_io->psram_clk_io, OUTPUT | FUNCTION_2);
- esp32_configgpio(psram_io->psram_spiq_sd0_io, OUTPUT | INPUT | FUNCTION_2);
- esp32_configgpio(psram_io->psram_spid_sd1_io, OUTPUT | INPUT | FUNCTION_2);
+ esp32_configgpio(psram_io->flash_cs_io, OUTPUT | FUNCTION_3);
+ esp32_configgpio(psram_io->psram_cs_io, OUTPUT | FUNCTION_3);
+ esp32_configgpio(psram_io->psram_clk_io, OUTPUT | FUNCTION_3);
+ esp32_configgpio(psram_io->psram_spiq_sd0_io, OUTPUT | INPUT | FUNCTION_3);
+ esp32_configgpio(psram_io->psram_spid_sd1_io, OUTPUT | INPUT | FUNCTION_3);
esp32_configgpio(psram_io->psram_spihd_sd2_io, OUTPUT | INPUT | \
- FUNCTION_2);
+ FUNCTION_3);
esp32_configgpio(psram_io->psram_spiwp_sd3_io, OUTPUT | INPUT | \
- FUNCTION_2);
+ FUNCTION_3);
#if 0
uint32_t flash_id = g_rom_flashchip.device_id;