Update Zephyr MSDK Hal based on MSDK PR: analogdevicesinc/msdk#1211

analogdevicesinc · Oct 8, 2024 · cd383b0 · cd383b0
1 parent c30e05b
commit cd383b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/MAX/Libraries/PeriphDrivers/Source/I2C/i2c_me18.c b/MAX/Libraries/PeriphDrivers/Source/I2C/i2c_me18.c
@@ -74,10 +74,10 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
 #endif
     } else if (i2c == MXC_I2C2) {
         MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_I2C2);
-#ifndef MAX32690GTK_PACKAGE_TQFN
         MXC_GPIO_Config(&gpio_cfg_i2c2);
-#endif
+#ifndef MAX32690GTK_PACKAGE_TQFN
         MXC_GPIO_Config(&gpio_cfg_i2c2c);
+#endif
     } else {
         return E_NO_DEVICE;
     }

diff --git a/MAX/Libraries/PeriphDrivers/Source/I2C/i2c_reva.c b/MAX/Libraries/PeriphDrivers/Source/I2C/i2c_reva.c
@@ -994,7 +994,7 @@ int MXC_I2C_RevA_MasterTransaction(mxc_i2c_reva_req_t *req)
     } else {
         i2c->mstctrl |= MXC_F_I2C_REVA_MSTCTRL_STOP;
 
-        while (!(i2c->intfl0 & MXC_F_I2C_REVA_INTFL0_STOP)) {}
+        while (!(i2c->mstctrl & MXC_F_I2C_REVA_MSTCTRL_STOP)) {}
         // Wait for Transaction to finish
     }
 

diff --git a/MAX/msdk_sha b/MAX/msdk_sha
@@ -1 +1 @@
-469f7f71d9fd38fcbbb1f3e7d382e407574dd08b
+79c0d9ae4d7ae85edd9f72fc3fc80f79931ad6d0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		469f7f71d9fd38fcbbb1f3e7d382e407574dd08b
		79c0d9ae4d7ae85edd9f72fc3fc80f79931ad6d0