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

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

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_ai87.c b/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_ai87.c
@@ -46,6 +46,7 @@ unsigned int MXC_SDHC_Get_Clock_Config(void)
 /* ************************************************************************** */
 int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
 {
+#ifndef MSDK_NO_GPIO_CLK_INIT
     mxc_gpio_regs_t *gpio = gpio_cfg_sdhc.port;
 
     // Startup the IPO clock if it's not on already
@@ -62,6 +63,7 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
     gpio->ds0 |= gpio_cfg_sdhc.mask;
 
     MXC_GPIO_Config(&gpio_cfg_sdhc);
+#endif
     return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
 }
 

diff --git a/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me10.c b/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me10.c
@@ -37,13 +37,15 @@
 /* ************************************************************************** */
 int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
 {
+#ifndef MSDK_NO_GPIO_CLK_INIT
     MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_SDHC);
 
     MXC_GPIO_Config(&gpio_cfg_sdhc_0);
     MXC_GPIO_Config(&gpio_cfg_sdhc_1);
     gpio_cfg_sdhc_1.port->vssel |= gpio_cfg_sdhc_1.mask;
     gpio_cfg_sdhc_0.port->ds_sel0 |= gpio_cfg_sdhc_0.mask;
     gpio_cfg_sdhc_1.port->ds_sel0 |= gpio_cfg_sdhc_1.mask;
+#endif
 
     return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
 }

diff --git a/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me13.c b/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me13.c
@@ -45,6 +45,7 @@ unsigned int MXC_SDHC_Get_Clock_Config(void)
 /* ************************************************************************** */
 int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
 {
+#ifndef MSDK_NO_GPIO_CLK_INIT
     mxc_gpio_regs_t *gpio = gpio_cfg_sdhc.port;
 
     // Startup the HIRC96M clock if it's not on already
@@ -61,6 +62,8 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
     gpio->ds |= gpio_cfg_sdhc.mask;
 
     MXC_GPIO_Config(&gpio_cfg_sdhc);
+#endif
+
     return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
 }
 

diff --git a/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me14.c b/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me14.c
@@ -46,6 +46,7 @@ unsigned int MXC_SDHC_Get_Clock_Config(void)
 /* ************************************************************************** */
 int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
 {
+#ifndef MSDK_NO_GPIO_CLK_INIT
     mxc_gpio_regs_t *gpio = gpio_cfg_sdhc.port;
 
     // Startup the HIRC96M clock if it's not on already
@@ -62,6 +63,8 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
     gpio->ds0 |= gpio_cfg_sdhc.mask;
 
     MXC_GPIO_Config(&gpio_cfg_sdhc);
+#endif
+
     return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
 }
 

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