From 7db8b920ff3bd575b29fcb8bc641f90d77ef7a76 Mon Sep 17 00:00:00 2001 From: Abdelatif Guettouche Date: Mon, 28 Sep 2020 20:48:26 +0100 Subject: [PATCH] arch/xtensa/src/esp32/hardware: PIN_CTRL was defined twice. Signed-off-by: Abdelatif Guettouche --- arch/xtensa/src/esp32/hardware/esp32_iomux.h | 2 +- arch/xtensa/src/esp32/hardware/esp32_soc.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/xtensa/src/esp32/hardware/esp32_iomux.h b/arch/xtensa/src/esp32/hardware/esp32_iomux.h index 894c9737df4..48f4fb67eec 100644 --- a/arch/xtensa/src/esp32/hardware/esp32_iomux.h +++ b/arch/xtensa/src/esp32/hardware/esp32_iomux.h @@ -63,7 +63,7 @@ #define PIN_FUNC_GPIO 2 -#define PIN_CTRL (DR_REG_IO_MUX_BASE +0x00) +#define PIN_CTRL (DR_REG_IO_MUX_BASE + 0x00) #define CLK_OUT3 0xf #define CLK_OUT3_S 8 #define CLK_OUT2 0xf diff --git a/arch/xtensa/src/esp32/hardware/esp32_soc.h b/arch/xtensa/src/esp32/hardware/esp32_soc.h index 746b3810a01..3bda2237632 100644 --- a/arch/xtensa/src/esp32/hardware/esp32_soc.h +++ b/arch/xtensa/src/esp32/hardware/esp32_soc.h @@ -776,8 +776,6 @@ extern int rom_i2c_writeReg(int block, int block_id, int reg_add, #define FE2_TX_INF_FORCE_PD_V 1 #define FE2_TX_INF_FORCE_PD_S 9 -#define PIN_CTRL (DR_REG_IO_MUX_BASE + 0x00) - /**************************************************************************** * Inline Functions ****************************************************************************/