soc: nxp_s32: consolidate part number options

Currently, the NXP S32 SoCs have three redundant Kconfig hidden options to define the part number. To streamline this, we will retain `CONFIG_SOC_PART_NUMBER` to store the part number as a string and `CONFIG_SOC_PART_NUMBER_<part>` that can be selected by the boards. Furthermore, for drivers requiring conditional code compilation based on the target SoC, they should utilize the series or SoC config option as applicable, instead of the part number config. Signed-off-by: Manuel Argüelles <[email protected]>
KyraLengfeld · Nov 15, 2023 · 1a05cfc · 1a05cfc
1 parent 8ca4f5b
commit 1a05cfc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/boards/arm/mr_canhubk3/Kconfig.board b/boards/arm/mr_canhubk3/Kconfig.board
@@ -4,4 +4,4 @@
 config BOARD_MR_CANHUBK3
 	bool "mr_canhubk3"
 	depends on SOC_SERIES_S32K3XX
-	select SOC_PART_NUMBER_S32K344
+	select SOC_PART_NUMBER_PS32K344EHVPBS
diff --git a/drivers/ethernet/eth_nxp_s32_gmac.c b/drivers/ethernet/eth_nxp_s32_gmac.c
@@ -78,7 +78,7 @@ static inline struct net_if *get_iface(struct eth_nxp_s32_data *ctx, uint16_t vl
 #endif
 }
 
-#if defined(CONFIG_SOC_PART_NUMBER_S32K3)
+#if defined(CONFIG_SOC_SERIES_S32K3XX)
 static int select_phy_interface(Gmac_Ip_MiiModeType mode)
 {
 	uint32_t regval;
@@ -105,7 +105,7 @@ static int select_phy_interface(Gmac_Ip_MiiModeType mode)
 }
 #else
 #error "SoC not supported"
-#endif /* CONFIG_SOC_PART_NUMBER_S32K3 */
+#endif /* CONFIG_SOC_SERIES_S32K3XX */
 
 static int eth_nxp_s32_init(const struct device *dev)
 {

diff --git a/soc/arm/nxp_s32/Kconfig b/soc/arm/nxp_s32/Kconfig
@@ -35,8 +35,4 @@ config NXP_S32_DEST_RESET_THRESHOLD
 
 source "soc/arm/nxp_s32/*/Kconfig.soc"
 
-config SOC_PART_NUMBER
-	default SOC_PART_NUMBER_S32ZE_R52 if SOC_SERIES_S32ZE_R52
-	default SOC_PART_NUMBER_S32K3 if SOC_SERIES_S32K3XX
-
 endif # SOC_FAMILY_NXP_S32
diff --git a/soc/arm/nxp_s32/common/power_soc.c b/soc/arm/nxp_s32/common/power_soc.c
@@ -71,7 +71,7 @@ static int nxp_s32_power_init(void)
 	};
 
 	const Power_Ip_PMC_ConfigType pmc_cfg = {
-#ifdef CONFIG_SOC_PART_NUMBER_S32K3
+#ifdef CONFIG_SOC_SERIES_S32K3XX
 		/* PMC Configuration Register (CONFIG) */
 		.ConfigRegister = PMC_CONFIG_LMEN(IS_ENABLED(CONFIG_NXP_S32_PMC_LMEN))
 			| PMC_CONFIG_LMBCTLEN(IS_ENABLED(CONFIG_NXP_S32_PMC_LMBCTLEN)),

diff --git a/soc/arm/nxp_s32/s32k3/Kconfig.soc b/soc/arm/nxp_s32/s32k3/Kconfig.soc
@@ -14,12 +14,12 @@ endchoice
 
 if SOC_SERIES_S32K3XX
 
-config SOC_PART_NUMBER_S32K344
+config SOC_PART_NUMBER_PS32K344EHVPBS
 	bool
 
-config SOC_PART_NUMBER_S32K3
+config SOC_PART_NUMBER
 	string
-	default "S32K344" if SOC_PART_NUMBER_S32K344
+	default "PS32K344EHVPBS" if SOC_PART_NUMBER_PS32K344EHVPBS
 	help
 	  This string holds the full part number of the SoC. It is a hidden option
 	  that you should not set directly. The part number selection choice defines

diff --git a/soc/arm/nxp_s32/s32ze/Kconfig.soc b/soc/arm/nxp_s32/s32ze/Kconfig.soc
@@ -1,6 +1,6 @@
 # NXP S32Z/E MCUs family
 
-# Copyright 2022 NXP
+# Copyright 2022-2023 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 choice
@@ -18,7 +18,7 @@ if SOC_SERIES_S32ZE_R52
 config SOC_PART_NUMBER_S32Z27
 	bool
 
-config SOC_PART_NUMBER_S32ZE_R52
+config SOC_PART_NUMBER
 	string
 	default "S32Z27" if SOC_PART_NUMBER_S32Z27
 	help