From f087d10eb32c0ac1f58183bc1c5b676ad0a41d8f Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 16 Dec 2024 15:55:21 +0000 Subject: [PATCH] Update Zephyr MSDK Hal based on MSDK PR: https://github.com/analogdevicesinc/msdk/pull/1295 --- .../PeriphDrivers/Source/SPI/spi_me30.c | 53 +++---------------- MAX/msdk_sha | 2 +- 2 files changed, 7 insertions(+), 48 deletions(-) diff --git a/MAX/Libraries/PeriphDrivers/Source/SPI/spi_me30.c b/MAX/Libraries/PeriphDrivers/Source/SPI/spi_me30.c index ac48b4f2..1b97472b 100644 --- a/MAX/Libraries/PeriphDrivers/Source/SPI/spi_me30.c +++ b/MAX/Libraries/PeriphDrivers/Source/SPI/spi_me30.c @@ -88,30 +88,20 @@ int MXC_SPI_Init(mxc_spi_regs_t *spi, int masterMode, int quadModeUsed, int numS //clear mask gpio_cfg_spi.mask = 0; - // TODO(ME30): Validate pin assignments - // check rest of the pins if (pins.clock) { - gpio_cfg_spi.mask |= MXC_GPIO_PIN_23; + gpio_cfg_spi.mask |= MXC_GPIO_PIN_6; } if (pins.miso) { - gpio_cfg_spi.mask |= MXC_GPIO_PIN_22; + gpio_cfg_spi.mask |= MXC_GPIO_PIN_4; } if (pins.mosi) { - gpio_cfg_spi.mask |= MXC_GPIO_PIN_21; - } - - if (pins.sdio2) { - gpio_cfg_spi.mask |= MXC_GPIO_PIN_24; - } - - if (pins.sdio3) { - gpio_cfg_spi.mask |= MXC_GPIO_PIN_25; + gpio_cfg_spi.mask |= MXC_GPIO_PIN_2; } if (pins.ss0) { - gpio_cfg_spi.mask |= MXC_GPIO_PIN_20; + gpio_cfg_spi.mask |= MXC_GPIO_PIN_3; } gpio_cfg_spi.func = MXC_GPIO_FUNC_ALT1; @@ -146,40 +136,9 @@ int MXC_SPI_ReadyForSleep(mxc_spi_regs_t *spi) int MXC_SPI_GetPeripheralClock(mxc_spi_regs_t *spi) { - int retval; - - // TODO(ME30): Validate this logic - int sys_clk = (MXC_GCR->clkctrl & MXC_F_GCR_CLKCTRL_SYSCLK_SEL) >> - MXC_F_GCR_CLKCTRL_SYSCLK_SEL_POS; - switch (sys_clk) { - case MXC_SYS_CLOCK_IPO: - retval = IPO_FREQ; - break; - case MXC_SYS_CLOCK_IBRO: - retval = IBRO_FREQ; - break; - case MXC_SYS_CLOCK_INRO: - retval = INRO_FREQ; - break; - case MXC_SYS_CLOCK_ERTCO: - retval = ERTCO_FREQ; - break; - // TODO(ME30): EXTCLK definition is missing from registers - // case MXC_SYS_CLOCK_EXTCLK: - // retval = EXTCLK_FREQ; - // break; -#if TARGET_NUM == 32655 || TARGET_NUM == 32680 - case MXC_SYS_CLOCK_ERFO: - retval = ERFO_FREQ; - break; -#endif - default: - return E_BAD_STATE; - } - - retval /= 2; + (void)spi; - return retval; + return PeripheralClock / 2; } int MXC_SPI_SetFrequency(mxc_spi_regs_t *spi, unsigned int hz) diff --git a/MAX/msdk_sha b/MAX/msdk_sha index 778a5b35..cefd5904 100644 --- a/MAX/msdk_sha +++ b/MAX/msdk_sha @@ -1 +1 @@ -0a0bb83b7c4a52cc66a46d744dad1c74e736d6ba +0b476027a67d9639ceb953fa806cfbb925c9ecfa