Skip to content

Commit bd5cc2b

Browse files
committed
fix(bsp): Remove I2C configuration from BSPs which used it only for touch controllers
1 parent f6cb4c2 commit bd5cc2b

File tree

25 files changed

+160
-265
lines changed

25 files changed

+160
-265
lines changed

bsp/esp-box-3/Kconfig

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ menu "Board Support Package(ESP-BOX-3)"
1313
range 0 1
1414
help
1515
ESP32S3 has two I2C peripherals, pick the one you want to use.
16-
17-
config BSP_I2C_FAST_MODE
18-
bool "Enable I2C fast mode"
19-
default y
20-
help
21-
I2C has two speed modes: normal (100kHz) and fast (400kHz).
22-
23-
config BSP_I2C_CLK_SPEED_HZ
24-
int
25-
default 400000 if BSP_I2C_FAST_MODE
26-
default 100000
2716
endmenu
2817

2918
menu "SPIFFS - Virtual File System"
@@ -89,7 +78,7 @@ menu "Board Support Package(ESP-BOX-3)"
8978
help
9079
Whether to enable double framebuf.
9180
endmenu
92-
81+
9382
config BSP_I2S_NUM
9483
int "I2S peripheral index"
9584
default 1

bsp/esp-box-3/esp-box-3.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,6 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t
728728
ESP_LOGE(TAG, "Touch not found");
729729
return ESP_ERR_NOT_FOUND;
730730
}
731-
tp_io_config.scl_speed_hz =
732-
CONFIG_BSP_I2C_CLK_SPEED_HZ; // Overwrite the default value with a configurable one
733731

734732
ESP_RETURN_ON_ERROR(esp_lcd_new_panel_io_i2c(i2c_handle, &tp_io_config, &tp_io_handle), TAG, "");
735733
if (ESP_LCD_TOUCH_IO_I2C_TT21100_ADDRESS == tp_io_config.dev_addr) {

bsp/esp-box-3/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 3.1.0
1+
version: 3.2.0
22
description: Board Support Package (BSP) for ESP32-S3-BOX-3
33
url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp-box-3
44

bsp/esp32_p4_function_ev_board/esp32_p4_function_ev_board.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,6 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t
854854
},
855855
};
856856
esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG();
857-
tp_io_config.scl_speed_hz = CONFIG_BSP_I2C_CLK_SPEED_HZ;
858857
ESP_RETURN_ON_ERROR(esp_lcd_new_panel_io_i2c(i2c_handle, &tp_io_config, &tp_io_handle), TAG, "");
859858
return esp_lcd_touch_new_i2c_gt911(tp_io_handle, &tp_cfg, ret_touch);
860859
}

bsp/esp32_p4_function_ev_board/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "5.2.2"
1+
version: "5.2.3"
22
description: Board Support Package (BSP) for ESP32-P4 Function EV Board (preview)
33
url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_p4_function_ev_board
44

bsp/esp32_s3_korvo_2/Kconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ menu "Board Support Package"
1313
range 0 1
1414
help
1515
ESP32-S3 has two I2C peripherals, pick the one you want to use.
16-
17-
config BSP_I2C_FAST_MODE
18-
bool "Enable I2C fast mode"
19-
default y
20-
help
21-
I2C has two speed modes: normal (100kHz) and fast (400kHz).
22-
23-
config BSP_I2C_CLK_SPEED_HZ
24-
int
25-
default 400000 if BSP_I2C_FAST_MODE
26-
default 100000
2716
endmenu
2817

2918
menu "uSD card - Virtual File System"

bsp/esp32_s3_korvo_2/esp32_s3_korvo_2.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,6 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t
507507

508508
esp_lcd_panel_io_handle_t tp_io_handle = NULL;
509509
esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_TT21100_CONFIG();
510-
tp_io_config.scl_speed_hz =
511-
CONFIG_BSP_I2C_CLK_SPEED_HZ; // Overwrite the default value with a configurable one
512510
ESP_RETURN_ON_ERROR(esp_lcd_new_panel_io_i2c(i2c_handle, &tp_io_config, &tp_io_handle), TAG, "");
513511

514512
/* Initialize touch */

bsp/esp32_s3_korvo_2/idf_component.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "4.1.2"
1+
version: "4.2.0"
22
description: Board Support Package (BSP) for ESP32-S3-Korvo-2
33
url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_korvo_2
44

@@ -10,10 +10,10 @@ tags:
1010

1111
dependencies:
1212
idf: ">=5.4" # I2C Driver-NG is supported in esp32-camera only from IDFv5.4
13-
esp_lcd_ili9341:
13+
esp_lcd_ili9341:
1414
version: "^2.0.1"
1515
override_path: "../../components/lcd/esp_lcd_ili9341"
16-
esp_lcd_touch_tt21100:
16+
esp_lcd_touch_tt21100:
1717
version: "^1"
1818
override_path: "../../components/lcd_touch/esp_lcd_touch_tt21100"
1919

bsp/esp32_s3_lcd_ev_board/Kconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ menu "Board Support Package"
1313
range 0 1
1414
help
1515
ESP32S3 has two I2C peripherals, pick the one you want to use.
16-
17-
config BSP_I2C_FAST_MODE
18-
bool "Enable I2C fast mode"
19-
default y
20-
help
21-
I2C has two speed modes: normal (100kHz) and fast (400kHz).
22-
23-
config BSP_I2C_CLK_SPEED_HZ
24-
int
25-
default 400000 if BSP_I2C_FAST_MODE
26-
default 100000
2716
endmenu
2817

2918
menu "SPIFFS - Virtual File System"

bsp/esp32_s3_lcd_ev_board/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "4.0.3"
1+
version: "4.1.0"
22
description: Board Support Package (BSP) for ESP32-S3-LCD-EV-Board
33
url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_lcd_ev_board
44

0 commit comments

Comments
 (0)