From e443fbd6db3385b9ad240f1cae89931c5d21e975 Mon Sep 17 00:00:00 2001 From: Ayush Singh Date: Tue, 1 Apr 2025 23:46:12 +0530 Subject: [PATCH] soc: ti: k3: Add support for AM6232 - AM6232 is a dual core variant of AM6234 with everything being smae. - Used in the first batch of PocketBeagle 2 Signed-off-by: Ayush Singh --- soc/ti/k3/am6x/Kconfig | 1 + soc/ti/k3/am6x/Kconfig.soc | 5 +++++ soc/ti/k3/am6x/common/ctrl_partitions.c | 4 ++-- soc/ti/k3/soc.yml | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/soc/ti/k3/am6x/Kconfig b/soc/ti/k3/am6x/Kconfig index e690eacb246..2612712d551 100644 --- a/soc/ti/k3/am6x/Kconfig +++ b/soc/ti/k3/am6x/Kconfig @@ -33,6 +33,7 @@ config SOC_SERIES_AM6X_R5 select SOC_EARLY_INIT_HOOK config SOC_PART_NUMBER + default "AM6232" if SOC_AM6232_M4 default "AM6234" if SOC_AM6234_A53 default "AM6234" if SOC_AM6234_M4 default "AM6442" if SOC_AM6442_M4 diff --git a/soc/ti/k3/am6x/Kconfig.soc b/soc/ti/k3/am6x/Kconfig.soc index 82c56f200b8..8efcc1ed546 100644 --- a/soc/ti/k3/am6x/Kconfig.soc +++ b/soc/ti/k3/am6x/Kconfig.soc @@ -31,6 +31,10 @@ config SOC_AM6234_M4 bool select SOC_SERIES_AM6X_M4 +config SOC_AM6232_M4 + bool + select SOC_SERIES_AM6X_M4 + config SOC_AM6442_M4 bool select SOC_SERIES_AM6X_M4 @@ -51,6 +55,7 @@ config SOC_SERIES default "am6x" if SOC_SERIES_AM6X config SOC + default "am6232" if SOC_AM6232_M4 default "am6234" if SOC_AM6234_M4 || SOC_AM6234_A53 default "am6442" if SOC_AM6442_M4 default "j721e" if SOC_J721E_MAIN_R5F0_0 diff --git a/soc/ti/k3/am6x/common/ctrl_partitions.c b/soc/ti/k3/am6x/common/ctrl_partitions.c index 48d5c3cdc86..83df836e5ce 100644 --- a/soc/ti/k3/am6x/common/ctrl_partitions.c +++ b/soc/ti/k3/am6x/common/ctrl_partitions.c @@ -19,7 +19,7 @@ #if defined CONFIG_SOC_AM6442_M4 #define MCU_PADCFG_BASE (0x4080000) -#elif defined CONFIG_SOC_AM6234_M4 +#elif defined CONFIG_SOC_AM6234_M4 | defined CONFIG_SOC_AM6232_M4 #define WKUP_PADCFG_BASE (0x4080000) #endif @@ -27,7 +27,7 @@ static const uintptr_t ctrl_partitions[] = { #if defined CONFIG_SOC_AM6442_M4 CTRL_PARTITION(MCU_PADCFG_BASE, 0), CTRL_PARTITION(MCU_PADCFG_BASE, 1), -#elif defined CONFIG_SOC_AM6234_M4 +#elif defined CONFIG_SOC_AM6234_M4 | defined CONFIG_SOC_AM6232_M4 CTRL_PARTITION(WKUP_PADCFG_BASE, 0), CTRL_PARTITION(WKUP_PADCFG_BASE, 1), #endif diff --git a/soc/ti/k3/soc.yml b/soc/ti/k3/soc.yml index 44e530703a8..dbfc4d30f4b 100644 --- a/soc/ti/k3/soc.yml +++ b/soc/ti/k3/soc.yml @@ -3,6 +3,9 @@ family: series: - name: am6x socs: + - name: am6232 + cpuclusters: + - name: m4 - name: am6234 cpuclusters: - name: m4