Skip to content

Commit fb16329

Browse files
Glauber Maroto Ferreiracfriedt
authored andcommitted
soc: esp32: partial code standardization
Replaces the prefixes of gpio_matrix_in and gpio_matrix_out to unify those function calls on all supported socs. Signed-off-by: Glauber Maroto Ferreira <[email protected]>
1 parent e231d50 commit fb16329

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

drivers/i2c/i2c_esp32.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ static int i2c_esp32_configure_pins(int pin, int matrix_out, int matrix_in)
120120
return ret;
121121
}
122122

123-
esp32_rom_gpio_matrix_out(pin, matrix_out, false, false);
124-
esp32_rom_gpio_matrix_in(pin, matrix_in, false);
123+
esp_rom_gpio_matrix_out(pin, matrix_out, false, false);
124+
esp_rom_gpio_matrix_in(pin, matrix_in, false);
125125

126126
return 0;
127127
}

drivers/pwm/pwm_led_esp32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static int pwm_led_esp32_channel_set(int pin, bool speed_mode, int channel,
245245
} else {
246246
sig_out_idx = LEDC_LS_SIG_OUT0_IDX + channel;
247247
}
248-
esp32_rom_gpio_matrix_out(pin, sig_out_idx, 0, 0);
248+
esp_rom_gpio_matrix_out(pin, sig_out_idx, 0, 0);
249249

250250
return 0;
251251
}

drivers/serial/uart_esp32.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,24 +221,24 @@ static int uart_esp32_configure_pins(const struct device *dev)
221221
{
222222
const struct uart_esp32_config *const cfg = DEV_CFG(dev);
223223

224-
esp32_rom_gpio_matrix_out(cfg->pins.tx,
224+
esp_rom_gpio_matrix_out(cfg->pins.tx,
225225
cfg->signals.tx_out,
226226
false,
227227
false);
228228

229-
esp32_rom_gpio_matrix_in(cfg->pins.rx,
229+
esp_rom_gpio_matrix_in(cfg->pins.rx,
230230
cfg->signals.rx_in,
231231
false);
232232

233233
if (cfg->pins.cts) {
234-
esp32_rom_gpio_matrix_out(cfg->pins.cts,
234+
esp_rom_gpio_matrix_out(cfg->pins.cts,
235235
cfg->signals.cts_in,
236236
false,
237237
false);
238238
}
239239

240240
if (cfg->pins.rts) {
241-
esp32_rom_gpio_matrix_in(cfg->pins.rts,
241+
esp_rom_gpio_matrix_in(cfg->pins.rts,
242242
cfg->signals.rts_out,
243243
false);
244244
}

drivers/spi/spi_esp32_spim.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ static int spi_esp32_configure_pin(gpio_pin_t pin, int pin_sig,
149149
}
150150

151151
if (pin_mode == GPIO_INPUT) {
152-
esp32_rom_gpio_matrix_in(pin, pin_sig, false);
152+
esp_rom_gpio_matrix_in(pin, pin_sig, false);
153153
} else {
154-
esp32_rom_gpio_matrix_out(pin, pin_sig, false, false);
154+
esp_rom_gpio_matrix_out(pin, pin_sig, false, false);
155155
}
156156

157157
return 0;

soc/xtensa/esp32/soc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ static inline void esp32_clear_mask32(uint32_t v, uint32_t mem_addr)
3131

3232
extern void esp32_rom_intr_matrix_set(int cpu_no, uint32_t model_num, uint32_t intr_num);
3333

34-
extern int esp32_rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_index,
34+
extern int esp_rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_index,
3535
bool inverted);
36-
extern int esp32_rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_index,
36+
extern int esp_rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_index,
3737
bool out_inverted,
3838
bool out_enabled_inverted);
3939

0 commit comments

Comments
 (0)