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

analogdevicesinc · Oct 9, 2024 · df2472c · df2472c
1 parent c1c6683
commit df2472c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 12 deletions.
diff --git a/MAX/Libraries/PeriphDrivers/Source/LP/lp_me12.c b/MAX/Libraries/PeriphDrivers/Source/LP/lp_me12.c
@@ -58,7 +58,7 @@ void MXC_LP_EnterBackupMode(void)
     // Should never reach this line - device will jump to backup vector on exit from background mode.
 }
 
-void MXC_LP_EnterShutDownMode(void)
+void MXC_LP_EnterPowerDownMode(void)
 {
     MXC_GCR->pm &= ~MXC_F_GCR_PM_MODE;
     MXC_GCR->pm |= MXC_S_GCR_PM_MODE_SHUTDOWN;

diff --git a/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_ai87.c b/MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_ai87.c
@@ -46,7 +46,6 @@ 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
@@ -63,7 +62,6 @@ 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,15 +37,13 @@
 /* ************************************************************************** */
 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,7 +45,6 @@ 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,8 +61,6 @@ 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,7 +46,6 @@ 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
@@ -63,8 +62,6 @@ 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 @@
-0162ce4d19f51ab5693dd4b007959e68361a864c
+b566324fbeef553e432371f2b49f83d0dd5ef96a