drivers: ipm: Remove CONFIG_IPM_IMX_REV2

Remove CONFIG_IPM_IMX_REV2, as this Kconfig is no longer needed. The driver can now be enabled with CONFIG_IPM_IMX. Update NXP HAL to remove this Kconfig as well. Signed-off-by: Daniel DeGrasse <[email protected]>
zephyrproject-rtos · Nov 3, 2023 · 507059e · 507059e
1 parent 75a1caf
commit 507059e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/drivers/ipm/CMakeLists.txt b/drivers/ipm/CMakeLists.txt
@@ -6,7 +6,6 @@ zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_IPM_MCUX   ipm_mcux.c)
 zephyr_library_sources_ifdef(CONFIG_IPM_IMX ipm_imx.c)
-zephyr_library_sources_ifdef(CONFIG_IPM_IMX_REV2 ipm_imx.c)
 zephyr_library_sources_ifdef(CONFIG_IPM_MHU ipm_mhu.c)
 zephyr_library_sources_ifdef(CONFIG_IPM_STM32_IPCC ipm_stm32_ipcc.c)
 zephyr_library_sources_ifdef(CONFIG_IPM_NRFX ipm_nrfx_ipc.c)

diff --git a/drivers/ipm/Kconfig.imx b/drivers/ipm/Kconfig.imx
@@ -15,17 +15,11 @@ config IPM_IMX
 	help
 	  Driver for NXP i.MX messaging unit
 
-config IPM_IMX_REV2
-	bool "IMX IPM driver (rev 2)"
-	default y
-	depends on DT_HAS_NXP_IMX_MU_REV2_ENABLED
-	help
-	  Rev 2 driver for NXP i.MX messaging unit (MCUX-based)
+if IPM_IMX
 
 choice
 	prompt "IMX IPM max data size"
 	default IPM_IMX_MAX_DATA_SIZE_16
-	depends on IPM_IMX || IPM_IMX_REV2
 	help
 	  Select maximum message size for NXP i.MX messaging unit.
 
@@ -55,18 +49,17 @@ config IPM_IMX_MAX_DATA_SIZE
 	default 4 if IPM_IMX_MAX_DATA_SIZE_4
 	default 8 if IPM_IMX_MAX_DATA_SIZE_8
 	default 16 if IPM_IMX_MAX_DATA_SIZE_16
-	depends on IPM_IMX || IPM_IMX_REV2
 
 config IPM_IMX_MAX_ID_VAL
 	int
 	range 0 3
 	default 3 if IPM_IMX_MAX_DATA_SIZE_4
 	default 1 if IPM_IMX_MAX_DATA_SIZE_8
 	default 0 if IPM_IMX_MAX_DATA_SIZE_16
-	depends on IPM_IMX || IPM_IMX_REV2
 
 config IPM_IMX_FW_READY_REPLY
 	bool "Send FW_READY reply message"
-	depends on IPM_IMX || IPM_IMX_REV2
 	help
 	  Send FW_READY reply to check for FW boot completion
+
+endif # IPM_IMX
diff --git a/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.defconfig.mimx8ml8_m7 b/soc/arm/nxp_imx/mimx8ml8_m7/Kconfig.defconfig.mimx8ml8_m7
@@ -16,7 +16,7 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 config GPIO
 	default y
 
-config IPM_IMX_REV2
+config IPM_IMX
 	default y
 	depends on IPM
 

diff --git a/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.defconfig.mimx8mm6_m4 b/soc/arm/nxp_imx/mimx8mm6_m4/Kconfig.defconfig.mimx8mm6_m4
@@ -13,7 +13,7 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 	int
 	default 400000000
 
-config IPM_IMX_REV2
+config IPM_IMX
 	default y
 	depends on IPM
 

diff --git a/west.yml b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: ad142f5612d927e29b1f9606e8edade871b8a526
+      revision: 361ccc5962dfc691f6134d73605fed063c4d26cd
       path: modules/hal/nxp
       groups:
         - hal