From 80b93bb71cfff8b0ba9bbb5704231216f7518998 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 15 Jul 2022 10:25:27 -0500 Subject: [PATCH] arm: mach-k3: Rename SOC_K3_AM6 to SOC_K3_AM654 The first AM6x device was the AM654x, but being the first we named it just AM6, since more devices have come out with this same prefix we should switch it to the normal convention of using the full name of the first compatibility device the series. This makes what device we are talking about more clear and matches all the K3 devices added since. Signed-off-by: Andrew Davis Reviewed-by: Tom Rini --- arch/arm/dts/Makefile | 2 +- arch/arm/mach-k3/Kconfig | 14 +++++++------- arch/arm/mach-k3/Makefile | 2 +- arch/arm/mach-k3/{am6_init.c => am654_init.c} | 0 arch/arm/mach-k3/arm64-mmu.c | 4 ++-- arch/arm/mach-k3/include/mach/hardware.h | 2 +- arch/arm/mach-k3/include/mach/spl.h | 2 +- board/siemens/iot2050/Kconfig | 2 +- board/ti/am65x/Kconfig | 4 ++-- configs/am65x_evm_a53_defconfig | 2 +- configs/am65x_evm_r5_defconfig | 2 +- configs/am65x_evm_r5_usbdfu_defconfig | 2 +- configs/am65x_evm_r5_usbmsc_defconfig | 2 +- configs/am65x_hs_evm_a53_defconfig | 2 +- configs/am65x_hs_evm_r5_defconfig | 2 +- configs/iot2050_defconfig | 2 +- drivers/dma/ti/Makefile | 2 +- drivers/dma/ti/k3-psil.c | 2 +- drivers/ram/Kconfig | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) rename arch/arm/mach-k3/{am6_init.c => am654_init.c} (100%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 3a2cb64be2..7fa275ea7c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1194,7 +1194,7 @@ dtb-$(CONFIG_STM32MP15x) += \ stm32mp15xx-dhcor-avenger96.dtb \ stm32mp15xx-dhcor-drc-compact.dtb -dtb-$(CONFIG_SOC_K3_AM6) += \ +dtb-$(CONFIG_SOC_K3_AM654) += \ k3-am654-base-board.dtb \ k3-am654-r5-base-board.dtb \ k3-am65-iot2050-spl.dtb \ diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 57f693e9a1..0d21f26275 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -4,8 +4,8 @@ choice prompt "Texas Instruments' K3 based SoC select" optional -config SOC_K3_AM6 - bool "TI's K3 based AM6 SoC Family Support" +config SOC_K3_AM654 + bool "TI's K3 based AM654 SoC Family Support" config SOC_K3_J721E bool "TI's K3 based J721E SoC Family Support" @@ -26,7 +26,7 @@ config SYS_SOC config SYS_K3_NON_SECURE_MSRAM_SIZE hex - default 0x80000 if SOC_K3_AM6 + default 0x80000 if SOC_K3_AM654 default 0x100000 if SOC_K3_J721E || SOC_K3_J721S2 default 0x1c0000 if SOC_K3_AM642 default 0x3c000 if SOC_K3_AM625 @@ -38,7 +38,7 @@ config SYS_K3_NON_SECURE_MSRAM_SIZE config SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE hex - default 0x58000 if SOC_K3_AM6 + default 0x58000 if SOC_K3_AM654 default 0xc0000 if SOC_K3_J721E || SOC_K3_J721S2 default 0x180000 if SOC_K3_AM642 default 0x38000 if SOC_K3_AM625 @@ -48,21 +48,21 @@ config SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE config SYS_K3_MCU_SCRATCHPAD_BASE hex - default 0x40280000 if SOC_K3_AM6 + default 0x40280000 if SOC_K3_AM654 default 0x40280000 if SOC_K3_J721E || SOC_K3_J721S2 help Describes the base address of MCU Scratchpad RAM. config SYS_K3_MCU_SCRATCHPAD_SIZE hex - default 0x200 if SOC_K3_AM6 + default 0x200 if SOC_K3_AM654 default 0x200 if SOC_K3_J721E || SOC_K3_J721S2 help Describes the size of MCU Scratchpad RAM. config SYS_K3_BOOT_PARAM_TABLE_INDEX hex - default 0x41c7fbfc if SOC_K3_AM6 + default 0x41c7fbfc if SOC_K3_AM654 default 0x41cffbfc if SOC_K3_J721E default 0x41cfdbfc if SOC_K3_J721S2 default 0x701bebfc if SOC_K3_AM642 diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile index e17ad22141..0dce8802db 100644 --- a/arch/arm/mach-k3/Makefile +++ b/arch/arm/mach-k3/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_CPU_V7R) += r5_mpu.o lowlevel_init.o obj-$(CONFIG_TI_SECURE_DEVICE) += security.o obj-$(CONFIG_ARM64) += cache.o ifeq ($(CONFIG_SPL_BUILD),y) -obj-$(CONFIG_SOC_K3_AM6) += am6_init.o +obj-$(CONFIG_SOC_K3_AM654) += am654_init.o obj-$(CONFIG_SOC_K3_J721E) += j721e_init.o obj-$(CONFIG_SOC_K3_J721S2) += j721s2_init.o obj-$(CONFIG_SOC_K3_AM642) += am642_init.o diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am654_init.c similarity index 100% rename from arch/arm/mach-k3/am6_init.c rename to arch/arm/mach-k3/am654_init.c diff --git a/arch/arm/mach-k3/arm64-mmu.c b/arch/arm/mach-k3/arm64-mmu.c index c43c07ce7f..b4d7ab1f16 100644 --- a/arch/arm/mach-k3/arm64-mmu.c +++ b/arch/arm/mach-k3/arm64-mmu.c @@ -13,7 +13,7 @@ #include #include -#ifdef CONFIG_SOC_K3_AM6 +#ifdef CONFIG_SOC_K3_AM654 /* NR_DRAM_BANKS + 32bit IO + 64bit IO + terminator */ #define NR_MMU_REGIONS (CONFIG_NR_DRAM_BANKS + 5) @@ -64,7 +64,7 @@ struct mm_region am654_mem_map[NR_MMU_REGIONS] = { }; struct mm_region *mem_map = am654_mem_map; -#endif /* CONFIG_SOC_K3_AM6 */ +#endif /* CONFIG_SOC_K3_AM654 */ #ifdef CONFIG_SOC_K3_J721E diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h index 7c6928d5da..7bbd5c22c9 100644 --- a/arch/arm/mach-k3/include/mach/hardware.h +++ b/arch/arm/mach-k3/include/mach/hardware.h @@ -6,7 +6,7 @@ #ifndef _ASM_ARCH_HARDWARE_H_ #define _ASM_ARCH_HARDWARE_H_ -#ifdef CONFIG_SOC_K3_AM6 +#ifdef CONFIG_SOC_K3_AM654 #include "am6_hardware.h" #endif diff --git a/arch/arm/mach-k3/include/mach/spl.h b/arch/arm/mach-k3/include/mach/spl.h index 17996f2938..c9a324a5f0 100644 --- a/arch/arm/mach-k3/include/mach/spl.h +++ b/arch/arm/mach-k3/include/mach/spl.h @@ -6,7 +6,7 @@ #ifndef _ASM_ARCH_SPL_H_ #define _ASM_ARCH_SPL_H_ -#ifdef CONFIG_SOC_K3_AM6 +#ifdef CONFIG_SOC_K3_AM654 #include "am6_spl.h" #endif diff --git a/board/siemens/iot2050/Kconfig b/board/siemens/iot2050/Kconfig index 8f634c172c..063142a43b 100644 --- a/board/siemens/iot2050/Kconfig +++ b/board/siemens/iot2050/Kconfig @@ -9,7 +9,7 @@ config TARGET_IOT2050_A53 bool "IOT2050 running on A53" select ARM64 - select SOC_K3_AM6 + select SOC_K3_AM654 select BOARD_LATE_INIT select SYS_DISABLE_DCACHE_OPS select BINMAN diff --git a/board/ti/am65x/Kconfig b/board/ti/am65x/Kconfig index 16a7476d9c..4765b13ba0 100644 --- a/board/ti/am65x/Kconfig +++ b/board/ti/am65x/Kconfig @@ -10,7 +10,7 @@ choice config TARGET_AM654_A53_EVM bool "TI K3 based AM654 EVM running on A53" select ARM64 - select SOC_K3_AM6 + select SOC_K3_AM654 select SYS_DISABLE_DCACHE_OPS select BOARD_LATE_INIT imply TI_I2C_BOARD_DETECT @@ -19,7 +19,7 @@ config TARGET_AM654_R5_EVM bool "TI K3 based AM654 EVM running on R5" select CPU_V7R select SYS_THUMB_BUILD - select SOC_K3_AM6 + select SOC_K3_AM654 select K3_LOAD_SYSFW select K3_AM654_DDRSS imply SYS_K3_SPL_ATF diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig index fabb116ba4..0ca0ebc8c0 100644 --- a/configs/am65x_evm_a53_defconfig +++ b/configs/am65x_evm_a53_defconfig @@ -6,7 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_SOC_K3_AM6=y +CONFIG_SOC_K3_AM654=y CONFIG_TARGET_AM654_A53_EVM=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig index 5232b97970..7622495b5f 100644 --- a/configs/am65x_evm_r5_defconfig +++ b/configs/am65x_evm_r5_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_SOC_K3_AM6=y +CONFIG_SOC_K3_AM654=y CONFIG_K3_EARLY_CONS=y CONFIG_TARGET_AM654_R5_EVM=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/am65x_evm_r5_usbdfu_defconfig b/configs/am65x_evm_r5_usbdfu_defconfig index edfd9a7462..b096388103 100644 --- a/configs/am65x_evm_r5_usbdfu_defconfig +++ b/configs/am65x_evm_r5_usbdfu_defconfig @@ -7,7 +7,7 @@ CONFIG_SPL_MISC=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_SOC_K3_AM6=y +CONFIG_SOC_K3_AM654=y CONFIG_K3_EARLY_CONS=y CONFIG_TARGET_AM654_R5_EVM=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/am65x_evm_r5_usbmsc_defconfig b/configs/am65x_evm_r5_usbmsc_defconfig index e7e2226473..641daa6353 100644 --- a/configs/am65x_evm_r5_usbmsc_defconfig +++ b/configs/am65x_evm_r5_usbmsc_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_SOC_K3_AM6=y +CONFIG_SOC_K3_AM654=y CONFIG_K3_EARLY_CONS=y CONFIG_TARGET_AM654_R5_EVM=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig index 3ce290467a..1b3b25b2cb 100644 --- a/configs/am65x_hs_evm_a53_defconfig +++ b/configs/am65x_hs_evm_a53_defconfig @@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_SOC_K3_AM6=y +CONFIG_SOC_K3_AM654=y CONFIG_TARGET_AM654_A53_EVM=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 diff --git a/configs/am65x_hs_evm_r5_defconfig b/configs/am65x_hs_evm_r5_defconfig index 6e63f0e880..d3a0420b1c 100644 --- a/configs/am65x_hs_evm_r5_defconfig +++ b/configs/am65x_hs_evm_r5_defconfig @@ -7,7 +7,7 @@ CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_SOC_K3_AM6=y +CONFIG_SOC_K3_AM654=y CONFIG_K3_EARLY_CONS=y CONFIG_TARGET_AM654_R5_EVM=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig index b50b5d0938..203748100a 100644 --- a/configs/iot2050_defconfig +++ b/configs/iot2050_defconfig @@ -7,7 +7,7 @@ CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_SOC_K3_AM6=y +CONFIG_SOC_K3_AM654=y CONFIG_TARGET_IOT2050_A53=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 diff --git a/drivers/dma/ti/Makefile b/drivers/dma/ti/Makefile index 56f348700d..6807eb8e8b 100644 --- a/drivers/dma/ti/Makefile +++ b/drivers/dma/ti/Makefile @@ -3,7 +3,7 @@ obj-$(CONFIG_TI_K3_NAVSS_UDMA) += k3-udma.o obj-$(CONFIG_TI_K3_PSIL) += k3-psil-data.o k3-psil-data-y += k3-psil.o -k3-psil-data-$(CONFIG_SOC_K3_AM6) += k3-psil-am654.o +k3-psil-data-$(CONFIG_SOC_K3_AM654) += k3-psil-am654.o k3-psil-data-$(CONFIG_SOC_K3_J721E) += k3-psil-j721e.o k3-psil-data-$(CONFIG_SOC_K3_J721S2) += k3-psil-j721s2.o k3-psil-data-$(CONFIG_SOC_K3_AM642) += k3-psil-am64.o diff --git a/drivers/dma/ti/k3-psil.c b/drivers/dma/ti/k3-psil.c index f1330bf4b0..f23c8ca2b7 100644 --- a/drivers/dma/ti/k3-psil.c +++ b/drivers/dma/ti/k3-psil.c @@ -16,7 +16,7 @@ struct psil_endpoint_config *psil_get_ep_config(u32 thread_id) int i; if (!soc_ep_map) { - if (IS_ENABLED(CONFIG_SOC_K3_AM6)) + if (IS_ENABLED(CONFIG_SOC_K3_AM654)) soc_ep_map = &am654_ep_map; else if (IS_ENABLED(CONFIG_SOC_K3_J721E)) soc_ep_map = &j721e_ep_map; diff --git a/drivers/ram/Kconfig b/drivers/ram/Kconfig index 7c346180ba..86857c0627 100644 --- a/drivers/ram/Kconfig +++ b/drivers/ram/Kconfig @@ -45,7 +45,7 @@ config MPC83XX_SDRAM config K3_AM654_DDRSS bool "Enable AM654 DDRSS support" - depends on RAM && SOC_K3_AM6 + depends on RAM && SOC_K3_AM654 help K3 based AM654 devices has DDR memory subsystem that comprises Synopys DDR controller, Synopsis DDR phy and wrapper logic to