Skip to content

Commit f3435b7

Browse files
dleach02MaureenHelm
authored andcommitted
hal: nxp: Update to SDK 2.10.0
Updating to the SDK 2.10.0 for select platforms. west.yml: - Update to point to the NXP HAL update with SDK 2.10.0 files - modules/tee/tfm needed to be updated to synchronize the LPCXPRESSO55S69 platform SDK to version 2.10.0 to be in sync with Zephyr usage of SDK 2.10.0 drivers/counter/counter_mcux_pit.c: - underlying SDK 2.10.0 adjusted the setting by -1 so need to adjust the reported value set by +1 drivers/ethernet/eth_mcux.c: - SDK2.10 ethernet driver provided an assert test that highlighted we were using the wrong clock source on various platforms. drivers/memc/memc_mcux_flexspi.c: - SDK2.10 added compile time conditional on whether a field was defined for the flexspi configuration structure. Signed-off-by: David Leach <[email protected]>
1 parent 33d5be8 commit f3435b7

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

drivers/counter/counter_mcux_pit.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,14 @@ static uint32_t mcux_pit_get_top_value(const struct device *dev)
3333
const struct mcux_pit_config *config = dev->config;
3434
pit_chnl_t channel = config->pit_channel;
3535

36-
return config->base->CHANNEL[channel].LDVAL;
36+
/*
37+
* According to RM, the LDVAL trigger = clock ticks -1
38+
* The underlying HAL driver function PIT_SetTimerPeriod()
39+
* automatically subtracted 1 from the value that ends up in
40+
* LDVAL so for reporting purposes we need to add it back in
41+
* here to by consistent.
42+
*/
43+
return (config->base->CHANNEL[channel].LDVAL + 1);
3744
}
3845

3946
static int mcux_pit_start(const struct device *dev)

drivers/ethernet/eth_mcux.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,13 @@ static void eth_mcux_init(const struct device *dev)
919919

920920
context->phy_state = eth_mcux_phy_state_initial;
921921

922+
#if defined(CONFIG_SOC_SERIES_IMX_RT10XX)
923+
sys_clock = CLOCK_GetFreq(kCLOCK_IpgClk);
924+
#elif defined(SOC_SERIES_IMX_RT11XX)
925+
sys_clock = CLOCK_GetFreq(kCLOCK_Root_Bus);
926+
#else
922927
sys_clock = CLOCK_GetFreq(kCLOCK_CoreSysClk);
928+
#endif
923929

924930
ENET_GetDefaultConfig(&enet_config);
925931
enet_config.interrupt |= kENET_RxFrameInterrupt;

drivers/memc/memc_mcux_flexspi.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,10 @@ static int memc_flexspi_init(const struct device *dev)
127127
flexspi_config.ahbConfig.enableAHBCachable = config->ahb_cacheable;
128128
flexspi_config.ahbConfig.enableAHBPrefetch = config->ahb_prefetch;
129129
flexspi_config.ahbConfig.enableReadAddressOpt = config->ahb_read_addr_opt;
130+
#if !(defined(FSL_FEATURE_FLEXSPI_HAS_NO_MCR0_COMBINATIONEN) && \
131+
FSL_FEATURE_FLEXSPI_HAS_NO_MCR0_COMBINATIONEN)
130132
flexspi_config.enableCombination = config->combination_mode;
133+
#endif
131134
flexspi_config.enableSckBDiffOpt = config->sck_differential_clock;
132135
flexspi_config.rxSampleClock = config->rx_sample_clock;
133136

west.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ manifest:
8888
groups:
8989
- hal
9090
- name: hal_nxp
91-
revision: 69c5db5d41f351d843326df0d133807910c8190b
91+
revision: d7387dc67266f74e8d4dd6b908ec447dd2efc942
9292
path: modules/hal/nxp
9393
groups:
9494
- hal
@@ -212,7 +212,7 @@ manifest:
212212
- debug
213213
- name: trusted-firmware-m
214214
path: modules/tee/tfm
215-
revision: 1ab3b62d641070a6e8574634168c374645f382b8
215+
revision: c74be3890c9d975976fde1b1a3b2f5742bec34c0
216216
groups:
217217
- tee
218218

0 commit comments

Comments
 (0)