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

analogdevicesinc · Oct 31, 2024 · 734a757 · 734a757
1 parent b7a4fd5
commit 734a757
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/MAX/Include/wrap_max32_tmr.h b/MAX/Include/wrap_max32_tmr.h
@@ -105,7 +105,8 @@ int Wrap_MXC_TMR_GetPendingInt(mxc_tmr_regs_t *tmr)
     (CONFIG_SOC_MAX32672) || (CONFIG_SOC_MAX32662) || (CONFIG_SOC_MAX32675) ||          \
     (CONFIG_SOC_MAX32680) || (CONFIG_SOC_MAX32657) || (CONFIG_SOC_MAX78002)
 
-#if defined(CONFIG_SOC_MAX32672) || (CONFIG_SOC_MAX32675) || (CONFIG_SOC_MAX32657)
+#if defined(CONFIG_SOC_MAX32672) || (CONFIG_SOC_MAX32675) || (CONFIG_SOC_MAX32657) || \
+    (CONFIG_SOC_MAX32670)
 /* All timers are 32bits */
 #define WRAP_MXC_IS_32B_TIMER(idx) (1)
 #elif defined(CONFIG_SOC_MAX32662)

diff --git a/MAX/Libraries/PeriphDrivers/Include/MAX32657/gpio.h b/MAX/Libraries/PeriphDrivers/Include/MAX32657/gpio.h
@@ -152,7 +152,9 @@ typedef enum {
 typedef enum {
     MXC_GPIO_PAD_NONE, /**< No pull-up or pull-down */
     MXC_GPIO_PAD_WEAK_PULL_UP, /**< Set pad to weak pull-up */
-    MXC_GPIO_PAD_WEAK_PULL_DOWN /**< Set pad to weak pull-down */
+    MXC_GPIO_PAD_WEAK_PULL_DOWN, /**< Set pad to weak pull-down */
+    MXC_GPIO_PAD_PULL_UP = MXC_GPIO_PAD_WEAK_PULL_UP, /**< Set pad to default (weak) pull-up */
+    MXC_GPIO_PAD_PULL_DOWN = MXC_GPIO_PAD_WEAK_PULL_DOWN /**< Set pad to default (weak) pull-down */
 } mxc_gpio_pad_t;
 
 /**

diff --git a/MAX/msdk_sha b/MAX/msdk_sha
@@ -1 +1 @@
-3bdf51490a750ab762b1fbe2430338f49751b686
+c75f2f7143b66b90dd6e699de4989b4437c893ae
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		3bdf51490a750ab762b1fbe2430338f49751b686
		c75f2f7143b66b90dd6e699de4989b4437c893ae