Skip to content

Commit df2472c

Browse files
committed
Update Zephyr MSDK Hal based on MSDK PR: analogdevicesinc/msdk#1219
1 parent c1c6683 commit df2472c

File tree

6 files changed

+2
-12
lines changed

6 files changed

+2
-12
lines changed

MAX/Libraries/PeriphDrivers/Source/LP/lp_me12.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void MXC_LP_EnterBackupMode(void)
5858
// Should never reach this line - device will jump to backup vector on exit from background mode.
5959
}
6060

61-
void MXC_LP_EnterShutDownMode(void)
61+
void MXC_LP_EnterPowerDownMode(void)
6262
{
6363
MXC_GCR->pm &= ~MXC_F_GCR_PM_MODE;
6464
MXC_GCR->pm |= MXC_S_GCR_PM_MODE_SHUTDOWN;

MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_ai87.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ unsigned int MXC_SDHC_Get_Clock_Config(void)
4646
/* ************************************************************************** */
4747
int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
4848
{
49-
#ifndef MSDK_NO_GPIO_CLK_INIT
5049
mxc_gpio_regs_t *gpio = gpio_cfg_sdhc.port;
5150

5251
// Startup the IPO clock if it's not on already
@@ -63,7 +62,6 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
6362
gpio->ds0 |= gpio_cfg_sdhc.mask;
6463

6564
MXC_GPIO_Config(&gpio_cfg_sdhc);
66-
#endif
6765
return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
6866
}
6967

MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me10.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,13 @@
3737
/* ************************************************************************** */
3838
int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
3939
{
40-
#ifndef MSDK_NO_GPIO_CLK_INIT
4140
MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_SDHC);
4241

4342
MXC_GPIO_Config(&gpio_cfg_sdhc_0);
4443
MXC_GPIO_Config(&gpio_cfg_sdhc_1);
4544
gpio_cfg_sdhc_1.port->vssel |= gpio_cfg_sdhc_1.mask;
4645
gpio_cfg_sdhc_0.port->ds_sel0 |= gpio_cfg_sdhc_0.mask;
4746
gpio_cfg_sdhc_1.port->ds_sel0 |= gpio_cfg_sdhc_1.mask;
48-
#endif
4947

5048
return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
5149
}

MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me13.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ unsigned int MXC_SDHC_Get_Clock_Config(void)
4545
/* ************************************************************************** */
4646
int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
4747
{
48-
#ifndef MSDK_NO_GPIO_CLK_INIT
4948
mxc_gpio_regs_t *gpio = gpio_cfg_sdhc.port;
5049

5150
// Startup the HIRC96M clock if it's not on already
@@ -62,8 +61,6 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
6261
gpio->ds |= gpio_cfg_sdhc.mask;
6362

6463
MXC_GPIO_Config(&gpio_cfg_sdhc);
65-
#endif
66-
6764
return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
6865
}
6966

MAX/Libraries/PeriphDrivers/Source/SDHC/sdhc_me14.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ unsigned int MXC_SDHC_Get_Clock_Config(void)
4646
/* ************************************************************************** */
4747
int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
4848
{
49-
#ifndef MSDK_NO_GPIO_CLK_INIT
5049
mxc_gpio_regs_t *gpio = gpio_cfg_sdhc.port;
5150

5251
// Startup the HIRC96M clock if it's not on already
@@ -63,8 +62,6 @@ int MXC_SDHC_Init(const mxc_sdhc_cfg_t *cfg)
6362
gpio->ds0 |= gpio_cfg_sdhc.mask;
6463

6564
MXC_GPIO_Config(&gpio_cfg_sdhc);
66-
#endif
67-
6865
return MXC_SDHC_RevA_Init((mxc_sdhc_reva_regs_t *)MXC_SDHC, cfg);
6966
}
7067

MAX/msdk_sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0162ce4d19f51ab5693dd4b007959e68361a864c
1+
b566324fbeef553e432371f2b49f83d0dd5ef96a

0 commit comments

Comments
 (0)