diff --git a/drivers/gdisp/SSD2119/gdisp_lld.c b/drivers/gdisp/SSD2119/gdisp_lld.c
index b7550794..b8884e0f 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld.c
+++ b/drivers/gdisp/SSD2119/gdisp_lld.c
@@ -58,8 +58,8 @@
 #if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD
 	/* Include the user supplied board definitions */
 	#include "gdisp_lld_board.h"
-#elif defined(BOARD_EMBEST_DMSTF4BB_FSMC)
-	#include "gdisp_lld_board_embest_dmstf4bb_fsmc.h"
+#elif defined(BOARD_EMBEST_DMSTF4BB)
+	#include "gdisp_lld_board_embest_dmstf4bb.h"
 #else
 	/* Include the user supplied board definitions */
 	#include "gdisp_lld_board.h"
diff --git a/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h b/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb.h
similarity index 100%
rename from drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h
rename to drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb.h
diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h
index 0ffbec2a..fa43f4ac 100644
--- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h
+++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h
@@ -42,7 +42,9 @@ static const I2CConfig i2ccfg2 = {
  * @notapi
  */
 static inline void init_board(void) {
-	palSetPadMode(GPIOC, 13, PAL_MODE_INPUT);
+	palSetPadMode(GPIOC, 13, PAL_MODE_INPUT);			/* TP IRQ */
+	palSetPadMode(GPIOB, 10, PAL_MODE_ALTERNATE(4));	/* I2C2 SCL */
+	palSetPadMode(GPIOB, 11, PAL_MODE_ALTERNATE(4));	/* I2C2 SDA */
 
 	i2cStart(&I2CD2, &i2ccfg2);
 }