nxp: hal: code update to reflect changes in SDK 2.13

HAL API changes in ethernet and pwm
SoC RT595 power management code change
west.yml update

Signed-off-by: Yves Vandervennet <yves.vandervennet@nxp.com>

drivers/ethernet/eth_mcux.c

@@ -113,6 +113,11 @@ enum eth_mcux_phy_state {
 	eth_mcux_phy_state_closing
 };
 
+struct _phy_resource {
+	mdioWrite write;
+	mdioRead read;
+};
+
 #if defined(CONFIG_NET_POWER_MANAGEMENT)
 extern uint32_t ENET_GetInstance(ENET_Type * base);
 static const clock_ip_name_t enet_clocks[] = ENET_CLOCKS;
@@ -174,6 +179,7 @@ struct eth_context {
 #endif
 	struct k_sem tx_buf_sem;
 	phy_handle_t *phy_handle;
+	struct _phy_resource *phy_config;
 	struct k_sem rx_thread_sem;
 	enum eth_mcux_phy_state phy_state;
 	bool enabled;
@@ -446,7 +452,7 @@ static void eth_mcux_phy_event(struct eth_context *context)
 	bool link_up;
 #if defined(CONFIG_SOC_SERIES_IMX_RT)
 	status_t res;
-	uint32_t ctrl2;
+	uint16_t ctrl2;
 #endif
 	phy_duplex_t phy_duplex = kPHY_FullDuplex;
 	phy_speed_t phy_speed = kPHY_Speed100M;
@@ -625,7 +631,7 @@ static void eth_mcux_phy_setup(struct eth_context *context)
 {
 #if defined(CONFIG_SOC_SERIES_IMX_RT)
 	status_t res;
-	uint32_t oms_override;
+	uint16_t oms_override;
 
 	/* Disable MII interrupts to prevent triggering PHY events. */
 	ENET_DisableInterrupts(context->base, ENET_EIR_MII_MASK);
@@ -1012,7 +1018,6 @@ static void eth_mcux_init(const struct device *dev)
 #endif
 
 	context->phy_state = eth_mcux_phy_state_initial;
-	context->phy_handle->mdioHandle->ops = &enet_ops;
 	context->phy_handle->ops = &phyksz8081_ops;
 
 #if defined(CONFIG_SOC_SERIES_IMX_RT10XX)
@@ -1543,18 +1548,29 @@ static void eth_mcux_err_isr(const struct device *dev)
 		tx_enet_frame_##n##_buf[NET_ETH_MAX_FRAME_SIZE];	\
 	static _mcux_driver_buffer uint8_t				\
 		rx_enet_frame_##n##_buf[NET_ETH_MAX_FRAME_SIZE];	\
-									\
-	static mdio_handle_t eth##n##_mdio_handle = {			\
-		  .resource.base = (ENET_Type *)DT_INST_REG_ADDR(n),	\
+	static status_t _MDIO_Write(uint8_t phyAddr, uint8_t regAddr, uint16_t data) \
+	{								\
+		return ENET_MDIOWrite((ENET_Type *)DT_INST_REG_ADDR(n), phyAddr, regAddr, data);\
 	};								\
 									\
+	static status_t _MDIO_Read(uint8_t phyAddr, uint8_t regAddr, uint16_t *pData) \
+	{  \
+		return ENET_MDIORead((ENET_Type *)DT_INST_REG_ADDR(n), phyAddr, regAddr, pData); \
+	}; \
+									\
+	static struct _phy_resource eth##n##_phy_resource = {		\
+		.read = _MDIO_Read,					\
+		.write = _MDIO_Write					\
+	};								\
 	static phy_handle_t eth##n##_phy_handle = {			\
-		  .mdioHandle = &eth##n##_mdio_handle,			\
+		.resource = (void *)&eth##n##_phy_resource		\
 	};								\
+	static struct _phy_resource eth##n##_phy_config;		\
 									\
 	static struct eth_context eth##n##_context = {			\
 		.base = (ENET_Type *)DT_INST_REG_ADDR(n),		\
 		.config_func = eth##n##_config_func,			\
+		.phy_config = &eth##n##_phy_config,			\
 		.phy_addr = DT_INST_PROP(n, phy_addr),		        \
 		.phy_duplex = kPHY_FullDuplex,				\
 		.phy_speed = kPHY_Speed100M,				\

drivers/memc/memc_mcux_flexspi.c

@@ -176,7 +176,11 @@ static int memc_flexspi_init(const struct device *dev)
 	FSL_FEATURE_FLEXSPI_HAS_NO_MCR0_COMBINATIONEN)
 	flexspi_config.enableCombination = data->combination_mode;
 #endif
+
+#if !(defined(FSL_FEATURE_FLEXSPI_HAS_NO_MCR2_SCKBDIFFOPT) && \
+	FSL_FEATURE_FLEXSPI_HAS_NO_MCR2_SCKBDIFFOPT)
 	flexspi_config.enableSckBDiffOpt = data->sck_differential_clock;
+#endif
 	flexspi_config.rxSampleClock = data->rx_sample_clock;
 
 	/* Configure AHB RX buffers, if any configuration settings are present */

drivers/pwm/pwm_mcux.c

@@ -94,6 +94,7 @@ static int mcux_pwm_set_cycles(const struct device *dev, uint32_t channel,
 			LOG_ERR("Could not set up pwm_freq=%d", pwm_freq);
 			return -EINVAL;
 		}
+		data->channel[channel].pwmchannelenable = true;
 
 		PWM_StopTimer(config->base, 1U << config->index);
 

soc/arm/nxp_imx/rt5xx/soc.c

@@ -152,7 +152,6 @@ static void usb_device_clock_init(void)
 	/* Make sure USBHS ram buffer and usb1 phy has power up */
 	POWER_DisablePD(kPDRUNCFG_APD_USBHS_SRAM);
 	POWER_DisablePD(kPDRUNCFG_PPD_USBHS_SRAM);
-	POWER_DisablePD(kPDRUNCFG_LP_HSPAD_FSPI0_VDET);
 	POWER_ApplyPD();
 
 	RESET_PeripheralReset(kUSBHS_PHY_RST_SHIFT_RSTn);

west.yml

@@ -93,7 +93,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: f41cf88971505257e7f4798d845699da3fdc36d0
+      revision: 2930bcb69025b1047a02a13ad845db2a6e123c7b
       path: modules/hal/nxp
       groups:
         - hal