diff --git a/bsp/CME_M7/StdPeriph_Driver/src/cmem7_i2c.c b/bsp/CME_M7/StdPeriph_Driver/src/cmem7_i2c.c
index 8d60b9ffe40c2ad852d251a3b04d30114e142d8d..a058771c14b086524da40361fa4e1511a0bea807 100644
--- a/bsp/CME_M7/StdPeriph_Driver/src/cmem7_i2c.c
+++ b/bsp/CME_M7/StdPeriph_Driver/src/cmem7_i2c.c
@@ -50,6 +50,9 @@ static uint32_t i2c_GetClock(I2C0_Type* I2Cx) {
     } else if ((uint32_t)I2Cx == (uint32_t)I2C1) {
         dividor = GLOBAL_CTRL->CLK_SEL_0_b.I2C1_CLK;
     }
+	else {
+		dividor = 0;
+	}
 
     return SYSTEM_CLOCK_FREQ / (1 << (dividor + 1));
 }
diff --git a/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-pdl-cat1/drivers/source/cy_sysclk_v2.c b/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-pdl-cat1/drivers/source/cy_sysclk_v2.c
index e9b5b6e3b5d2729fab39db0479a61dd78199394e..31b9311511f7ee8952ca2460ae5a7c35315cd2f7 100644
--- a/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-pdl-cat1/drivers/source/cy_sysclk_v2.c
+++ b/bsp/Infineon/libraries/IFX_PSOC6_HAL/mtb-pdl-cat1/drivers/source/cy_sysclk_v2.c
@@ -1820,7 +1820,7 @@ cy_en_sysclk_status_t Cy_SysClk_EcoConfigure(uint32_t freq, uint32_t cSum, uint3
 
 #if defined (CY_IP_MXS22SRSS)
 
-#define CY_SYSCLK_CTRIM_TABLE_MAX_ENTRIES 33U
+#define CY_SYSCLK_CTRIM_TABLE_MAX_ENTRIES 32U
 
 /*******************************************************************************
 * Function Name: Cy_SysClk_SelectEcoCtrim