diff --git a/drivers/clock_control/clock_control_mcux_syscon.c b/drivers/clock_control/clock_control_mcux_syscon.c index b7a39b11d11..b173131aa1d 100644 --- a/drivers/clock_control/clock_control_mcux_syscon.c +++ b/drivers/clock_control/clock_control_mcux_syscon.c @@ -206,7 +206,7 @@ static int mcux_lpc_syscon_clock_control_get_subsys_rate( #if (defined(FSL_FEATURE_SOC_USDHC_COUNT) && FSL_FEATURE_SOC_USDHC_COUNT) -#if CONFIG_SOC_FAMILY_NXP_MCX +#if CONFIG_SOC_SERIES_MCXN case MCUX_USDHC1_CLK: *rate = CLOCK_GetUsdhcClkFreq(); break; diff --git a/include/zephyr/drivers/ethernet/eth_nxp_enet_qos.h b/include/zephyr/drivers/ethernet/eth_nxp_enet_qos.h index 1ec5adaf887..0d85c073eed 100644 --- a/include/zephyr/drivers/ethernet/eth_nxp_enet_qos.h +++ b/include/zephyr/drivers/ethernet/eth_nxp_enet_qos.h @@ -11,7 +11,7 @@ #include /* Different platforms named the peripheral different in the register definitions */ -#ifdef CONFIG_SOC_FAMILY_NXP_MCX +#ifdef CONFIG_SOC_SERIES_MCXN #undef ENET #define ENET_QOS_NAME ENET #define ENET_QOS_ALIGNMENT 4 diff --git a/soc/nxp/mcx/Kconfig b/soc/nxp/mcx/Kconfig index b8ac7a08f17..ea81009e8a5 100644 --- a/soc/nxp/mcx/Kconfig +++ b/soc/nxp/mcx/Kconfig @@ -1,10 +1,12 @@ # Copyright 2024 NXP # SPDX-License-Identifier: Apache-2.0 -config SOC_FAMILY_NXP_MCX - select HAS_SEGGER_RTT - select CLOCK_CONTROL - select ARM +# Do NOT select anything from the MCX family kconfig, +# and do not make it a dependency of anything else. +# If there is some similarity between series, +# use if SERIES_A || SERIES_B or something of that +# effect rather than the family config. +# This is because MCX series is expected to be very diverse. if SOC_FAMILY_NXP_MCX diff --git a/soc/nxp/mcx/Kconfig.defconfig b/soc/nxp/mcx/Kconfig.defconfig index d4ef8eebce5..245cef62aea 100644 --- a/soc/nxp/mcx/Kconfig.defconfig +++ b/soc/nxp/mcx/Kconfig.defconfig @@ -1,27 +1,15 @@ # Copyright 2024 NXP # SPDX-License-Identifier: Apache-2.0 +# +# Do NOT select anything from the MCX family kconfig, +# and do not make it a dependency of anything else. +# If there is some similarity between series, +# use if SERIES_A || SERIES_B or something of that +# effect rather than the family config. +# This is because MCX series is expected to be very diverse. if SOC_FAMILY_NXP_MCX -if FLASH_MCUX_FLEXSPI_XIP - -# Code relocation is needed when FLASH_MCUX_FLEXSPI_XIP is enabled -config CODE_DATA_RELOCATION_SRAM - default y - -config FLASH_MCUX_FLEXSPI_XIP_MEM - string - default "RAM" - -endif # FLASH_MCUX_FLEXSPI_XIP - -config MFD - default y if DT_HAS_NXP_LP_FLEXCOMM_ENABLED - -choice USB_MCUX_CONTROLLER_TYPE - default USB_DC_NXP_EHCI -endchoice - rsource "*/Kconfig.defconfig" endif # SOC_FAMILY_NXP_MCX diff --git a/soc/nxp/mcx/mcxn/Kconfig b/soc/nxp/mcx/mcxn/Kconfig index e903c85e107..519f960e6d2 100644 --- a/soc/nxp/mcx/mcxn/Kconfig +++ b/soc/nxp/mcx/mcxn/Kconfig @@ -2,6 +2,9 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_MCXN + select HAS_SEGGER_RTT + select CLOCK_CONTROL + select ARM select HAS_MCUX select HAS_MCUX_FLEXCOMM select CPU_CORTEX_M_HAS_SYSTICK diff --git a/soc/nxp/mcx/mcxn/Kconfig.defconfig b/soc/nxp/mcx/mcxn/Kconfig.defconfig index 8c7534eaebc..763a2a91a28 100644 --- a/soc/nxp/mcx/mcxn/Kconfig.defconfig +++ b/soc/nxp/mcx/mcxn/Kconfig.defconfig @@ -3,6 +3,25 @@ if SOC_SERIES_MCXN +if FLASH_MCUX_FLEXSPI_XIP + +# Code relocation is needed when FLASH_MCUX_FLEXSPI_XIP is enabled +config CODE_DATA_RELOCATION_SRAM + default y + +config FLASH_MCUX_FLEXSPI_XIP_MEM + string + default "RAM" + +endif # FLASH_MCUX_FLEXSPI_XIP + +config MFD + default y if DT_HAS_NXP_LP_FLEXCOMM_ENABLED + +choice USB_MCUX_CONTROLLER_TYPE + default USB_DC_NXP_EHCI +endchoice + config NUM_IRQS default 155