board: phytec: am62x: Add support for 1 & 4 GB RAM variants

Use content of EEPROM to detect the actual RAM size and adjust
DDR timings, size and banks accordingly.
Also enable the SoM detection per default in the defconfigs.

Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Tested-by: John Ma <jma@phytec.com>

diff --git a/board/phytec/common/am6_som_detection.h b/board/phytec/common/am6_som_detection.h
index 032f9da3aab203dff24b61f1c4994021a47db6aa..c5c6e179da6de1dbf18a31e0df1119a0fc1a45ec 100644 (file)
--- a/board/phytec/common/am6_som_detection.h
+++ b/board/phytec/common/am6_som_detection.h
@@ -9,11 +9,19 @@
 
 #include "phytec_som_detection.h"
 
+#define EEPROM_ADDR                            0x50
 #define PHYTEC_AM62X_SOM                       71
 #define PHYTEC_AM64X_SOM                       72
 #define PHYTEC_EEPROM_VALUE_X                  0x21
 #define PHYTEC_EEPROM_NOR_FLASH_64MB_QSPI      0xC
 
+enum {
+       EEPROM_RAM_SIZE_512MB = 0,
+       EEPROM_RAM_SIZE_1GB = 1,
+       EEPROM_RAM_SIZE_2GB = 2,
+       EEPROM_RAM_SIZE_4GB = 4
+};
+
 int __maybe_unused phytec_am6_detect(struct phytec_eeprom_data *data);
 u8 __maybe_unused phytec_get_am6_ddr_size(struct phytec_eeprom_data *data);
 u8 __maybe_unused phytec_get_am6_spi(struct phytec_eeprom_data *data);

diff --git a/board/phytec/phycore_am62x/Kconfig b/board/phytec/phycore_am62x/Kconfig
index 1de8850c6c4644ff6f40b46b915827b6ed7301d0..7c179ef0078e41a874080b1fc4a0e7f782d4818e 100644 (file)
--- a/board/phytec/phycore_am62x/Kconfig
+++ b/board/phytec/phycore_am62x/Kconfig
@@ -35,3 +35,33 @@ config SPL_LDSCRIPT
 source "board/phytec/common/Kconfig"
 
 endif
+
+config PHYCORE_AM62X_RAM_SIZE_FIX
+        bool "Set phyCORE-AM62x RAM size fix instead of detecting"
+        default false
+        help
+          RAM size is automatic being detected with the help of
+          the EEPROM introspection data. Set RAM size to a fix value
+          instead.
+
+choice
+        prompt "phyCORE-AM62x RAM size"
+        depends on PHYCORE_AM62X_RAM_SIZE_FIX
+        default PHYCORE_AM62X_RAM_SIZE_2GB
+
+config PHYCORE_AM62X_RAM_SIZE_1GB
+        bool "1GB RAM"
+        help
+          Set RAM size fix to 1GB for phyCORE-AM62x.
+
+config PHYCORE_AM62X_RAM_SIZE_2GB
+        bool "2GB RAM"
+        help
+          Set RAM size fix to 2GB for phyCORE-AM62x.
+
+config PHYCORE_AM62X_RAM_SIZE_4GB
+        bool "4GB RAM"
+        help
+          Set RAM size fix to 4GB for phyCORE-AM62x.
+
+endchoice

diff --git a/board/phytec/phycore_am62x/phycore-am62x.c b/board/phytec/phycore_am62x/phycore-am62x.c
index a082b886bda7b2268d05e7aafe9a77d648089b41..4a76f1343d7b092429b6ed5ec8e82ef9d97e2a75 100644 (file)
--- a/board/phytec/phycore_am62x/phycore-am62x.c
+++ b/board/phytec/phycore_am62x/phycore-am62x.c
@@ -8,6 +8,13 @@
 #include <spl.h>
 #include <fdt_support.h>
 
+#include "phycore-ddr-data.h"
+#include "../common/k3/k3_ddrss_patch.h"
+#include "../common/am6_som_detection.h"
+
+#define AM64_DDRSS_SS_BASE     0x0F300000
+#define DDRSS_V2A_CTL_REG      0x0020
+
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
@@ -15,16 +22,157 @@ int board_init(void)
        return 0;
 }
 
+static u8 phytec_get_am62_ddr_size_default(void)
+{
+       int ret;
+       struct phytec_eeprom_data data;
+
+       if (IS_ENABLED(CONFIG_PHYCORE_AM62X_RAM_SIZE_FIX)) {
+               if (IS_ENABLED(CONFIG_PHYCORE_AM62X_RAM_SIZE_1GB))
+                       return EEPROM_RAM_SIZE_1GB;
+               else if (IS_ENABLED(CONFIG_PHYCORE_AM62X_RAM_SIZE_2GB))
+                       return EEPROM_RAM_SIZE_2GB;
+               else if (IS_ENABLED(CONFIG_PHYCORE_AM62X_RAM_SIZE_4GB))
+                       return EEPROM_RAM_SIZE_4GB;
+       }
+
+       ret = phytec_eeprom_data_setup(&data, 0, EEPROM_ADDR);
+       if (!ret && data.valid)
+               return phytec_get_am6_ddr_size(&data);
+
+       /* Default DDR size is 2GB */
+       return EEPROM_RAM_SIZE_2GB;
+}
+
 int dram_init(void)
 {
-       return fdtdec_setup_mem_size_base();
+       u8 ram_size = phytec_get_am62_ddr_size_default();
+
+       /*
+        * HACK: ddrss driver support 2GB RAM by default
+        * V2A_CTL_REG should be updated to support other RAM size
+        */
+       if (IS_ENABLED(CONFIG_K3_AM64_DDRSS))
+               if (ram_size == EEPROM_RAM_SIZE_4GB)
+                       writel(0x00000210, AM64_DDRSS_SS_BASE + DDRSS_V2A_CTL_REG);
+
+       switch (ram_size) {
+       case EEPROM_RAM_SIZE_1GB:
+               gd->ram_size = 0x40000000;
+               break;
+       case EEPROM_RAM_SIZE_2GB:
+               gd->ram_size = 0x80000000;
+               break;
+       case EEPROM_RAM_SIZE_4GB:
+#ifdef CONFIG_PHYS_64BIT
+               gd->ram_size = 0x100000000;
+#else
+               gd->ram_size = 0x80000000;
+#endif
+               break;
+       default:
+               gd->ram_size = 0x80000000;
+       }
+
+       return 0;
+}
+
+phys_size_t board_get_usable_ram_top(phys_size_t total_size)
+{
+#ifdef CONFIG_PHYS_64BIT
+       /* Limit RAM used by U-Boot to the DDR low region */
+       if (gd->ram_top > 0x100000000)
+               return 0x100000000;
+#endif
+       return gd->ram_top;
 }
 
 int dram_init_banksize(void)
 {
-       return fdtdec_setup_memory_banksize();
+       u8 ram_size;
+
+       ram_size = phytec_get_am62_ddr_size_default();
+       switch (ram_size) {
+       case EEPROM_RAM_SIZE_1GB:
+               gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
+               gd->bd->bi_dram[0].size = 0x40000000;
+               gd->ram_size = 0x40000000;
+               break;
+
+       case EEPROM_RAM_SIZE_2GB:
+               gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
+               gd->bd->bi_dram[0].size = 0x80000000;
+               gd->ram_size = 0x80000000;
+               break;
+
+       case EEPROM_RAM_SIZE_4GB:
+               /* Bank 0 declares the memory available in the DDR low region */
+               gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
+               gd->bd->bi_dram[0].size = 0x80000000;
+               gd->ram_size = 0x80000000;
+
+#ifdef CONFIG_PHYS_64BIT
+               /* Bank 1 declares the memory available in the DDR upper region */
+               gd->bd->bi_dram[1].start = 0x880000000;
+               gd->bd->bi_dram[1].size = 0x80000000;
+               gd->ram_size = 0x100000000;
+#endif
+               break;
+       default:
+               /* Continue with default 2GB setup */
+               gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
+               gd->bd->bi_dram[0].size = 0x80000000;
+               gd->ram_size = 0x80000000;
+               printf("DDR size %d is not supported\n", ram_size);
+       }
+
+       return 0;
+}
+
+#if defined(CONFIG_K3_DDRSS)
+int update_ddrss_timings(void)
+{
+       int ret;
+       u8 ram_size;
+       struct ddrss *ddr_patch = NULL;
+       void *fdt = (void *)gd->fdt_blob;
+
+       ram_size = phytec_get_am62_ddr_size_default();
+       switch (ram_size) {
+       case EEPROM_RAM_SIZE_1GB:
+               ddr_patch = &phycore_ddrss_data[PHYCORE_1GB];
+               break;
+       case EEPROM_RAM_SIZE_2GB:
+               ddr_patch = NULL;
+               break;
+       case EEPROM_RAM_SIZE_4GB:
+               ddr_patch = &phycore_ddrss_data[PHYCORE_4GB];
+               break;
+       default:
+               break;
+       }
+
+       /* Nothing to patch */
+       if (!ddr_patch)
+               return 0;
+
+       debug("Applying DDRSS timings patch for ram_size %d\n", ram_size);
+
+       ret = fdt_apply_ddrss_timings_patch(fdt, ddr_patch);
+       if (ret < 0) {
+               printf("Failed to apply ddrs timings patch %d\n", ret);
+               return ret;
+       }
+
+       return 0;
 }
 
+int do_board_detect(void)
+{
+       return update_ddrss_timings();
+}
+#endif
+
 #define CTRLMMR_USB0_PHY_CTRL   0x43004008
 #define CTRLMMR_USB1_PHY_CTRL   0x43004018
 #define CORE_VOLTAGE            0x80000000

diff --git a/board/phytec/phycore_am62x/phycore-ddr-data.h b/board/phytec/phycore_am62x/phycore-ddr-data.h
new file mode 100644 (file)
index 0000000..fe6eccd
--- /dev/null
+++ b/board/phytec/phycore_am62x/phycore-ddr-data.h
@@ -0,0 +1,206 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2024 PHYTEC Messtechnik GmbH
+ * Author: Wadim Egorov <w.egorov@phytec.de>
+ */
+
+#ifndef PHYCORE_DDR_DATA
+#define PHYCORE_DDR_DATA
+
+#include "../common/k3/k3_ddrss_patch.h"
+
+/* 1 GB variant delta */
+struct ddr_reg ddr_1gb_ctl_regs[] = {
+       { 55, 0x0400DB60 },
+       { 58, 0x0400DB60 },
+       { 61, 0x0400DB60 },
+       { 73, 0x00001860 },
+       { 75, 0x00001860 },
+       { 77, 0x00001860 },
+       { 119, 0x00061800 },
+       { 120, 0x00061800 },
+       { 121, 0x00061800 },
+       { 122, 0x00061800 },
+       { 123, 0x00061800 },
+       { 125, 0x0000AAA0 },
+       { 126, 0x00061800 },
+       { 127, 0x00061800 },
+       { 128, 0x00061800 },
+       { 129, 0x00061800 },
+       { 130, 0x00061800 },
+       { 132, 0x0000AAA0 },
+       { 133, 0x00061800 },
+       { 134, 0x00061800 },
+       { 135, 0x00061800 },
+       { 136, 0x00061800 },
+       { 137, 0x00061800 },
+       { 139, 0x0000AAA0 },
+       { 206, 0x00000000 },
+       { 209, 0x00000000 },
+       { 212, 0x00000000 },
+       { 215, 0x00000000 },
+       { 218, 0x00000000 },
+       { 221, 0x00000000 },
+       { 230, 0x00000000 },
+       { 231, 0x00000000 },
+       { 232, 0x00000000 },
+       { 233, 0x00000000 },
+       { 234, 0x00000000 },
+       { 235, 0x00000000 },
+       { 316, 0x01010000 },
+       { 318, 0x3FFF0000 },
+       { 327, 0x00000C01 },
+       { 328, 0x00000000 },
+       { 385, 0x000030C0 },
+       { 390, 0x0000DB60 },
+       { 391, 0x0001E780 },
+       { 394, 0x000030C0 },
+       { 399, 0x0000DB60 },
+       { 400, 0x0001E780 },
+       { 403, 0x000030C0 },
+       { 408, 0x0000DB60 },
+       { 409, 0x0001E780 }
+};
+
+struct ddr_reg ddr_1gb_pi_regs[] = {
+       { 77, 0x04000100 },
+       { 176, 0x00001860 },
+       { 178, 0x00001860 },
+       { 180, 0x04001860 },
+       { 233, 0x0000C570 },
+       { 238, 0x0000C570 },
+       { 243, 0x0000C570 },
+       { 247, 0x000030C0 },
+       { 248, 0x0001E780 },
+       { 249, 0x000030C0 },
+       { 250, 0x0001E780 },
+       { 251, 0x000030C0 },
+       { 252, 0x0001E780 },
+       { 299, 0x00000000 },
+       { 301, 0x00000000 },
+       { 307, 0x00000000 },
+       { 309, 0x00000000 },
+       { 315, 0x00000000 },
+       { 317, 0x00000000 },
+       { 323, 0x00000000 },
+       { 325, 0x00000000 },
+       { 331, 0x00000000 },
+       { 333, 0x00000000 },
+       { 339, 0x00000000 },
+       { 341, 0x00000000 }
+};
+
+struct ddr_reg ddr_1gb_phy_regs[] = {
+       { 1371, 0x0001F7C2 },
+};
+
+/* 4 GB variant delta */
+struct ddr_reg ddr_4gb_ctl_regs[] = {
+       { 55, 0x0400DB60 },
+       { 58, 0x0400DB60 },
+       { 61, 0x0400DB60 },
+       { 73, 0x00001860 },
+       { 75, 0x00001860 },
+       { 77, 0x00001860 },
+       { 119, 0x00061800 },
+       { 120, 0x00061800 },
+       { 121, 0x00061800 },
+       { 122, 0x00061800 },
+       { 123, 0x00061800 },
+       { 125, 0x0000AAA0 },
+       { 126, 0x00061800 },
+       { 127, 0x00061800 },
+       { 128, 0x00061800 },
+       { 129, 0x00061800 },
+       { 130, 0x00061800 },
+       { 132, 0x0000AAA0 },
+       { 133, 0x00061800 },
+       { 134, 0x00061800 },
+       { 135, 0x00061800 },
+       { 136, 0x00061800 },
+       { 137, 0x00061800 },
+       { 139, 0x0000AAA0 },
+       { 206, 0x00000000 },
+       { 209, 0x00000000 },
+       { 212, 0x00000000 },
+       { 215, 0x00000000 },
+       { 218, 0x00000000 },
+       { 221, 0x00000000 },
+       { 230, 0x00000000 },
+       { 231, 0x00000000 },
+       { 232, 0x00000000 },
+       { 233, 0x00000000 },
+       { 234, 0x00000000 },
+       { 235, 0x00000000 },
+       { 316, 0x00000000 },
+       { 318, 0x7FFF0000 },
+       { 327, 0x01000C01 },
+       { 328, 0x00000001 },
+       { 385, 0x000030C0 },
+       { 390, 0x0000DB60 },
+       { 391, 0x0001E780 },
+       { 394, 0x000030C0 },
+       { 399, 0x0000DB60 },
+       { 400, 0x0001E780 },
+       { 403, 0x000030C0 },
+       { 408, 0x0000DB60 },
+       { 409, 0x0001E780 }
+};
+
+struct ddr_reg ddr_4gb_pi_regs[] = {
+       { 77, 0x04000000 },
+       { 176, 0x00001860 },
+       { 178, 0x00001860 },
+       { 180, 0x04001860 },
+       { 233, 0x0000C570 },
+       { 238, 0x0000C570 },
+       { 243, 0x0000C570 },
+       { 247, 0x000030C0 },
+       { 248, 0x0001E780 },
+       { 249, 0x000030C0 },
+       { 250, 0x0001E780 },
+       { 251, 0x000030C0 },
+       { 252, 0x0001E780 },
+       { 299, 0x00000000 },
+       { 301, 0x00000000 },
+       { 307, 0x00000000 },
+       { 309, 0x00000000 },
+       { 315, 0x00000000 },
+       { 317, 0x00000000 },
+       { 323, 0x00000000 },
+       { 325, 0x00000000 },
+       { 331, 0x00000000 },
+       { 333, 0x00000000 },
+       { 339, 0x00000000 },
+       { 341, 0x00000000 }
+};
+
+struct ddr_reg ddr_4gb_phy_regs[] = {
+       { 1371, 0x0001F7C2 },
+};
+
+enum {
+       PHYCORE_1GB,
+       PHYCORE_4GB,
+};
+
+struct ddrss phycore_ddrss_data[] = {
+       [PHYCORE_1GB] = {
+               .ctl_regs = &ddr_1gb_ctl_regs[0],
+               .ctl_regs_num = ARRAY_SIZE(ddr_1gb_ctl_regs),
+               .pi_regs = &ddr_1gb_pi_regs[0],
+               .pi_regs_num = ARRAY_SIZE(ddr_1gb_pi_regs),
+               .phy_regs = &ddr_1gb_phy_regs[0],
+               .phy_regs_num = ARRAY_SIZE(ddr_1gb_phy_regs),
+       },
+       [PHYCORE_4GB] = {
+               .ctl_regs = &ddr_4gb_ctl_regs[0],
+               .ctl_regs_num = ARRAY_SIZE(ddr_4gb_ctl_regs),
+               .pi_regs = &ddr_4gb_pi_regs[0],
+               .pi_regs_num = ARRAY_SIZE(ddr_4gb_pi_regs),
+               .phy_regs = &ddr_4gb_phy_regs[0],
+               .phy_regs_num = ARRAY_SIZE(ddr_4gb_phy_regs),
+       },
+};
+
+#endif /* PHYCORE_DDR_DATA */

diff --git a/configs/phycore_am62x_a53_defconfig b/configs/phycore_am62x_a53_defconfig
index fd36edc29dd8a5c536d65d008ad3cc9bc29c0f49..145887c0286c765f8838b76fae379f6b61b8b4e5 100644 (file)
--- a/configs/phycore_am62x_a53_defconfig
+++ b/configs/phycore_am62x_a53_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_SOC_K3_AM625=y
+CONFIG_PHYTEC_SOM_DETECTION=y
 CONFIG_TARGET_PHYCORE_AM62X_A53=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
@@ -45,6 +46,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
+CONFIG_SPL_I2C=y
 CONFIG_SPL_DM_MAILBOX=y
 CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_POWER_DOMAIN=y
@@ -73,6 +75,8 @@ CONFIG_CLK_TI_SCI=y
 CONFIG_DMA_CHANNELS=y
 CONFIG_TI_K3_NAVSS_UDMA=y
 CONFIG_TI_SCI_PROTOCOL=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_OMAP24XX=y
 CONFIG_DM_MAILBOX=y
 CONFIG_K3_SEC_PROXY=y
 CONFIG_SUPPORT_EMMC_BOOT=y

diff --git a/configs/phycore_am62x_r5_defconfig b/configs/phycore_am62x_r5_defconfig
index 389672d52271c8b3a1d4a6ab6f80ee45d118b065..0062a4e356988199615d93aae14e5b3f6cf495ef 100644 (file)
--- a/configs/phycore_am62x_r5_defconfig
+++ b/configs/phycore_am62x_r5_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_SOC_K3_AM625=y
+CONFIG_PHYTEC_SOM_DETECTION=y
 CONFIG_TARGET_PHYCORE_AM62X_R5=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x43c3a7f0
@@ -50,6 +51,7 @@ CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
 CONFIG_SPL_EARLY_BSS=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
+CONFIG_SPL_I2C=y
 CONFIG_SPL_DM_MAILBOX=y
 CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_DM_RESET=y
@@ -88,6 +90,7 @@ CONFIG_SPL_CLK_K3_PLL=y
 CONFIG_SPL_CLK_K3=y
 CONFIG_TI_SCI_PROTOCOL=y
 CONFIG_DA8XX_GPIO=y
+CONFIG_DM_I2C=y
 CONFIG_DM_MAILBOX=y
 CONFIG_K3_SEC_PROXY=y
 CONFIG_SPL_MISC=y
@@ -129,3 +132,4 @@ CONFIG_SPL_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_LIB_RATIONAL=y
 CONFIG_SPL_LIB_RATIONAL=y
+CONFIG_SYS_I2C_OMAP24XX=y