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 <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 3a2cb64be2e8290f0893df3e1d50f8934cb9e0a9..7fa275ea7cca8fbe447dc46c10a36f7fa6467cc7 100644 (file)
--- 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 57f693e9a125380fafb27a62c86335e7147267e6..0d21f26275e9a74ca9cc2e946bdcd6df554fc873 100644 (file)
--- 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 e17ad2214190dcc49e7000897f679e142a13e3af..0dce8802dbbf15bc488e1cd23a083b4b59f01833 100644 (file)
--- 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 c43c07ce7faac9435ad0ace8efeca1990204d5f2..b4d7ab1f16dc89a48a6de043ea3758f2f5b23ae9 100644 (file)
--- a/arch/arm/mach-k3/arm64-mmu.c
+++ b/arch/arm/mach-k3/arm64-mmu.c
@@ -13,7 +13,7 @@
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 
-#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 7c6928d5da1cbde314128330d8541e9c9225e679..7bbd5c22c980c39c1c7a59ed1f7a15a4f118e6b2 100644 (file)
--- 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 17996f2938b76d5b0c8be36b14df430b3b84a597..c9a324a5f0fea61aaec237bc7a2f480c03d27444 100644 (file)
--- 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 8f634c172c128bdd442edfe2c50c70e534ec8efe..063142a43bfa735154d7d97ae6edcace22534510 100644 (file)
--- 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 16a7476d9c4bc94f782ab23fbf5d8a54af48ee35..4765b13ba0c67add6ea4d605e1e868ae99f9f4c1 100644 (file)
--- 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 fabb116ba441e0da61b473419d13b083bc9e56a9..0ca0ebc8c07fcc40257a808e67a11eb2bcc640db 100644 (file)
--- 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 5232b979709d1a9a285c690978d768eaea904076..7622495b5f6bc425572a05ec1bf91109759c1317 100644 (file)
--- 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 edfd9a746273c7fb92c2d727936e8c3c6c162bdd..b096388103e046bee2f8bf9fc2887f20fcb14a2e 100644 (file)
--- 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 e7e222647322c7f832199bbbafae46289cd789ba..641daa6353788fdeb955c123cebf8c48b0f88b95 100644 (file)
--- 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 3ce290467ab454b5a7d5193d7587ed7f479b5992..1b3b25b2cb3956f1de6e5e9ff54d57a72ec09c70 100644 (file)
--- 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 6e63f0e880787ef747f209828e729d144ff9ed7f..d3a0420b1c292abcebcf4dc36c9ad310f946abb1 100644 (file)
--- 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 b50b5d0938208fe21ae5715007db640e65b8825d..203748100a18250334cd94ffa4c20f2b3a0838a3 100644 (file)
--- 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 56f348700d4ef6c2151aa6853d8392317566673d..6807eb8e8b2d325c44ffd60d224bf97bfd2f9fc7 100644 (file)
--- 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 f1330bf4b034bad94f01f7e8832207e46b3bbe87..f23c8ca2b74c8a2cb3be50d6dad1cc37354b3f7a 100644 (file)
--- 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 7c346180baef5a88d425e71aeaec734a431b4354..86857c06272ef5513c33096a23422fa54b1098f7 100644 (file)
--- 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