modules: hal_nxp: Remove CONFIG_HAS_MCUX_FLEXCOMM

decsny · jhedberg · commit 83420a71399e · 2025-08-15T10:10:32.000+03:00
The presence of the flexcomm should be driven by DT, not this legacy
kconfig.

Signed-off-by: Declan Snyder &lt;declan.snyder@nxp.com&gt;
diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c
@@ -472,6 +472,12 @@ static int mcux_lpi2c_target_unregister(const struct device *dev,
 }
 #endif /* CONFIG_I2C_TARGET */
 
+#if DT_HAS_COMPAT_STATUS_OKAY(nxp_lp_flexcomm)
+#define LPI2C_IRQHANDLE_ARG LPI2C_GetInstance(base)
+#else
+#define LPI2C_IRQHANDLE_ARG base
+#endif
+
 static void mcux_lpi2c_isr(const struct device *dev)
 {
 	struct mcux_lpi2c_data *data = dev->data;
@@ -482,11 +488,8 @@ static void mcux_lpi2c_isr(const struct device *dev)
 		mcux_lpi2c_slave_irq_handler(dev);
 	}
 #endif /* CONFIG_I2C_TARGET */
-#if CONFIG_HAS_MCUX_FLEXCOMM
-	LPI2C_MasterTransferHandleIRQ(LPI2C_GetInstance(base), &data->handle);
-#else
-	LPI2C_MasterTransferHandleIRQ(base, &data->handle);
-#endif
+
+	LPI2C_MasterTransferHandleIRQ(LPI2C_IRQHANDLE_ARG, &data->handle);
 }
 
 static int mcux_lpi2c_init(const struct device *dev)
diff --git a/drivers/i2c/i2c_mcux_lpi2c_rtio.c b/drivers/i2c/i2c_mcux_lpi2c_rtio.c
@@ -278,16 +278,18 @@ static int mcux_lpi2c_transfer(const struct device *dev, struct i2c_msg *msgs,
 	return i2c_rtio_transfer(ctx, msgs, num_msgs, addr);
 }
 
+#if DT_HAS_COMPAT_STATUS_OKAY(nxp_lp_flexcomm)
+#define LPI2C_IRQHANDLE_ARG LPI2C_GetInstance(base)
+#else
+#define LPI2C_IRQHANDLE_ARG base
+#endif
+
 static void mcux_lpi2c_isr(const struct device *dev)
 {
 	struct mcux_lpi2c_data *data = dev->data;
 	LPI2C_Type *base = (LPI2C_Type *)DEVICE_MMIO_NAMED_GET(dev, reg_base);
 
-#if CONFIG_HAS_MCUX_FLEXCOMM
-	LPI2C_MasterTransferHandleIRQ(LPI2C_GetInstance(base), &data->handle);
-#else
-	LPI2C_MasterTransferHandleIRQ(base, &data->handle);
-#endif
+	LPI2C_MasterTransferHandleIRQ(LPI2C_IRQHANDLE_ARG, &data->handle);
 }
 
 static int mcux_lpi2c_init(const struct device *dev)
diff --git a/modules/hal_nxp/mcux/Kconfig.mcux b/modules/hal_nxp/mcux/Kconfig.mcux
@@ -81,11 +81,6 @@ config HAS_MCUX_FLEXCAN
 	help
 	  Set if the FlexCAN module is presents in the SoC.
 
-config HAS_MCUX_FLEXCOMM
-	bool
-	help
-	  Set if the flexcomm (FLEXCOMM) module is present in the SoC.
-
 config HAS_MCUX_FLEXSPI
 	bool
 	help
diff --git a/soc/nxp/imxrt/imxrt5xx/Kconfig b/soc/nxp/imxrt/imxrt5xx/Kconfig
@@ -18,7 +18,6 @@ config SOC_MIMXRT595S_CM33
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select HAS_MCUX
 	select HAS_MCUX_SYSCON
-	select HAS_MCUX_FLEXCOMM
 	select HAS_MCUX_FLEXSPI
 	select HAS_MCUX_CACHE
 	select HAS_MCUX_LPC_DMA
diff --git a/soc/nxp/imxrt/imxrt6xx/Kconfig b/soc/nxp/imxrt/imxrt6xx/Kconfig
@@ -16,7 +16,6 @@ config SOC_MIMXRT685S_CM33
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select HAS_MCUX
 	select HAS_MCUX_SYSCON
-	select HAS_MCUX_FLEXCOMM
 	select HAS_MCUX_FLEXSPI
 	select HAS_MCUX_CACHE
 	select HAS_MCUX_LPC_DMA
diff --git a/soc/nxp/imxrt/imxrt7xx/Kconfig b/soc/nxp/imxrt/imxrt7xx/Kconfig
@@ -21,7 +21,6 @@ config SOC_MIMXRT798S_CM33_CPU0
 	select INIT_ARCH_HW_AT_BOOT
 	select SOC_RESET_HOOK
 	select SOC_EARLY_INIT_HOOK
-	select HAS_MCUX_FLEXCOMM
 
 config SOC_MIMXRT798S_CM33_CPU1
 	select CPU_CORTEX_M33
@@ -36,7 +35,6 @@ config SOC_MIMXRT798S_CM33_CPU1
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select HAS_MCUX
 	select HAS_MCUX_SYSCON
-	select HAS_MCUX_FLEXCOMM
 
 config SOC_MIMXRT798S_HIFI4
 	select XTENSA
@@ -51,7 +49,6 @@ config SOC_MIMXRT798S_HIFI4
 	select NXP_INPUTMUX
 	select HAS_MCUX
 	select HAS_MCUX_SYSCON
-	select HAS_MCUX_FLEXCOMM
 
 config SOC_MIMXRT798S_HIFI1
 	select XTENSA
diff --git a/soc/nxp/lpc/lpc51u68/Kconfig b/soc/nxp/lpc/lpc51u68/Kconfig
@@ -10,7 +10,6 @@ config SOC_SERIES_LPC51U68
 	select ARM
 	select CPU_CORTEX_M0PLUS
 	select HAS_MCUX
-	select HAS_MCUX_FLEXCOMM
 	select HAS_MCUX_SYSCON
 	select HAS_MCUX_SCTIMER
 	select CPU_CORTEX_M_HAS_SYSTICK
diff --git a/soc/nxp/lpc/lpc54xxx/Kconfig b/soc/nxp/lpc/lpc54xxx/Kconfig
@@ -6,7 +6,6 @@
 config SOC_SERIES_LPC54XXX
 	select ARM
 	select HAS_MCUX
-	select HAS_MCUX_FLEXCOMM
 	select HAS_MCUX_SYSCON
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select SOC_RESET_HOOK
diff --git a/soc/nxp/lpc/lpc55xxx/Kconfig b/soc/nxp/lpc/lpc55xxx/Kconfig
@@ -3,7 +3,6 @@
 
 config SOC_SERIES_LPC55XXX
 	select HAS_MCUX
-	select HAS_MCUX_FLEXCOMM
 	select HAS_MCUX_SYSCON
 	select HAS_MCUX_WWDT
 	select CPU_CORTEX_M_HAS_SYSTICK
diff --git a/soc/nxp/mcx/mcxn/Kconfig b/soc/nxp/mcx/mcxn/Kconfig
@@ -6,7 +6,6 @@ config SOC_FAMILY_MCXN
 	select CLOCK_CONTROL
 	select ARM
 	select HAS_MCUX
-	select HAS_MCUX_FLEXCOMM
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select CPU_CORTEX_M_HAS_DWT
 	select HAS_MCUX_MCX_CMC
diff --git a/soc/nxp/rw/Kconfig b/soc/nxp/rw/Kconfig
@@ -14,7 +14,6 @@ config SOC_SERIES_RW6XX
 	select ARM_TRUSTZONE_M
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select HAS_MCUX
-	select HAS_MCUX_FLEXCOMM
 	select HAS_MCUX_CACHE
 	select HAS_PM
 	select HAS_NXP_MONOLITHIC_NBU

Original file line number	Diff line number	Diff line change
`@@ -472,6 +472,12 @@ static int mcux_lpi2c_target_unregister(const struct device *dev,`
`472`	`472`	`}`
`473`	`473`	`#endif /* CONFIG_I2C_TARGET */`
`474`	`474`
	`475`	`+#if DT_HAS_COMPAT_STATUS_OKAY(nxp_lp_flexcomm)`
	`476`	`+#define LPI2C_IRQHANDLE_ARG LPI2C_GetInstance(base)`
	`477`	`+#else`
	`478`	`+#define LPI2C_IRQHANDLE_ARG base`
	`479`	`+#endif`
	`480`	`+`
`475`	`481`	`static void mcux_lpi2c_isr(const struct device *dev)`
`476`	`482`	`{`
`477`	`483`	`struct mcux_lpi2c_data *data = dev->data;`
`@@ -482,11 +488,8 @@ static void mcux_lpi2c_isr(const struct device *dev)`
`482`	`488`	`mcux_lpi2c_slave_irq_handler(dev);`
`483`	`489`	`}`
`484`	`490`	`#endif /* CONFIG_I2C_TARGET */`
`485`		`-#if CONFIG_HAS_MCUX_FLEXCOMM`
`486`		`- LPI2C_MasterTransferHandleIRQ(LPI2C_GetInstance(base), &data->handle);`
`487`		`-#else`
`488`		`- LPI2C_MasterTransferHandleIRQ(base, &data->handle);`
`489`		`-#endif`
	`491`	`+`
	`492`	`+ LPI2C_MasterTransferHandleIRQ(LPI2C_IRQHANDLE_ARG, &data->handle);`
`490`	`493`	`}`
`491`	`494`
`492`	`495`	`static int mcux_lpi2c_init(const struct device *dev)`