Enable MMC UHS modes
Subsystems (2)
cover Enable MMC UHS modes
This patch series adds config options for Sitara K3 boards to support MMC UHS modes.
While testing with SD card boot and eMMC boot, found missing eMMC boot support for am62ax in am62a7_init, patch 1/7, and missing config option to support eMMC boot.
While we are here, for am62ax, enable config option to change MMC bus modes and enable r5 SDHCI ADMA for faster boot time.
Also for all k3 Sitara boards, cleanup MMC ENV configs that are no longer needed since we no longer load env from MMC device.
Changes since v1:
- rebase against next
Judith Mendez (6):
configs: am6*_evm_r5/a53_defconfig: Cleanup env configs
configs: am62x_evm_a53_defconfig: Enable MMC UHS modes
configs: am62ax_evm_a53_defconfig: Enable MMC UHS modes
configs: am62ax_evm_r5_defconfig: Enable SDHCI ADMA for r5 SPL
configs: am62ax_evm_a53_defconfig: Enable MMC_SPEED_MODE_SET
configs: am62ax_evm_a53_defconfig: Enable SUPPORT_EMMC_BOOT
Vignesh Raghavendra (1):
mach-k3: am62a7_init: Add FS and raw mode for eMMC
arch/arm/mach-k3/am62ax/am62a7_init.c | 19 +++++++++++++++++++ configs/am62ax_evm_a53_defconfig | 26 ++++++++++++++++++++++++-- configs/am62ax_evm_r5_defconfig | 4 +--- configs/am62px_evm_r5_defconfig | 3 --- configs/am62x_evm_a53_defconfig | 22 ++++++++++++++++++++++ configs/am64x_evm_r5_defconfig | 3 --- 6 files changed, 66 insertions(+), 11 deletions(-)
Signature · 1 line
2.47.1
PATCH RESEND 1/7 mach-k3: am62a7_init: Add FS and raw mode for eMMC
From: Vignesh Raghavendra <[email protected]>
This adds FS and raw boot mode support for eMMC similar to other K3 platforms.
--- arch/arm/mach-k3/am62ax/am62a7_init.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/arm/mach-k3/am62ax/am62a7_init.c +19 -0
@@ -171,6 +171,25 @@ void board_init_f(ulong dummy)debug ("am62a_init: %s done\n" , __func__); } +u32 spl_mmc_boot_mode (struct mmc *mmc,const u32 boot_device) +{ +u32 devstat =readl (CTRLMMR_MAIN_DEVSTAT ); +u32 bootmode = (devstat &MAIN_DEVSTAT_PRIMARY_BOOTMODE_MASK ) >> +MAIN_DEVSTAT_PRIMARY_BOOTMODE_SHIFT ; +u32 bootmode_cfg = (devstat &MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK ) >> +MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT ; + +switch (bootmode) { +case BOOT_DEVICE_EMMC : +return MMCSD_MODE_EMMCBOOT ; +case BOOT_DEVICE_MMC : +if (bootmode_cfg &MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK ) +return MMCSD_MODE_RAW ; +default : +return MMCSD_MODE_FS ; + } +} +u32 spl_boot_device (void ) {return get_boot_device ();
Signature · 1 line
2.47.1
PATCH RESEND 2/7 configs: am6*_evm_r5/a53_defconfig: Cleanup env configs
In reply to Judith MendezSince we do not load env from MMC device anymore, remove any MMC env config options.
--- configs/am62ax_evm_a53_defconfig | 1 + configs/am62ax_evm_r5_defconfig | 3 --- configs/am62px_evm_r5_defconfig | 3 --- configs/am62x_evm_a53_defconfig | 1 + configs/am64x_evm_r5_defconfig | 3 --- 5 files changed, 2 insertions(+), 9 deletions(-)
configs/am62ax_evm_a53_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_SPL_PAD_TO=0x0 CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MMCSD_RAW_MODE=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_DM_MAILBOX=y CONFIG_SPL_POWER_DOMAIN=y
configs/am62ax_evm_r5_defconfig +0 -3
@@ -8,7 +8,6 @@ CONFIG_TARGET_AM62A7_R5_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x43c3a7f0 CONFIG_ENV_SIZE=0x20000 -CONFIG_ENV_OFFSET=0x680000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="k3-am62a7-r5-sk" CONFIG_DM_RESET=y
@@ -63,9 +62,7 @@ CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_IS_NOWHERE=y -CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NO_NET=y CONFIG_SPL_DM=y CONFIG_SPL_DM_DEVICE_REMOVE=y
configs/am62px_evm_r5_defconfig +0 -3
@@ -10,7 +10,6 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x43c4a7f0 CONFIG_SF_DEFAULT_SPEED=25000000 CONFIG_SF_DEFAULT_MODE=0 CONFIG_ENV_SIZE=0x20000 -CONFIG_ENV_OFFSET=0x680000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="k3-am62p5-r5-sk" CONFIG_DM_RESET=y
@@ -67,9 +66,7 @@ CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_IS_NOWHERE=y -CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_MMC_ENV_PART=1 CONFIG_NO_NET=y CONFIG_SPL_DM=y CONFIG_SPL_DM_DEVICE_REMOVE=y
configs/am62x_evm_a53_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MMCSD_RAW_MODE=y 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_DM_MAILBOX=y CONFIG_SPL_DM_SPI_FLASH=y
configs/am64x_evm_r5_defconfig +0 -3
@@ -12,7 +12,6 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x7019b800 CONFIG_SF_DEFAULT_SPEED=25000000 CONFIG_ENV_SIZE=0x20000 -CONFIG_ENV_OFFSET=0x680000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="k3-am642-r5-evm"
@@ -85,9 +84,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_SPL_OF_LIST="k3-am642-r5-evm k3-am642-r5-sk" CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y -CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_MMC_ENV_PART=1 CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_REGMAP=y
Signature · 1 line
2.47.1
PATCH RESEND 3/7 configs: am62x_evm_a53_defconfig: Enable MMC UHS modes
In reply to Judith MendezEnable configs required to enable MMC UHS modes in A53 SPL and U-Boot proper.
--- configs/am62x_evm_a53_defconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
configs/am62x_evm_a53_defconfig +21 -0
@@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_K3=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2
@@ -9,6 +10,7 @@ CONFIG_TARGET_AM625_A53_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000 CONFIG_SF_DEFAULT_SPEED=25000000 +CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am625-sk" CONFIG_SPL_TEXT_BASE=0x80080000
@@ -43,6 +45,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
@@ -76,9 +79,21 @@ CONFIG_DFU_SF=y CONFIG_DMA_CHANNELS=y CONFIG_TI_K3_NAVSS_UDMA=y CONFIG_TI_SCI_PROTOCOL=y +CONFIG_SPL_DM_GPIO_LOOKUP_LABEL=y +CONFIG_DA8XX_GPIO=y +CONFIG_DM_PCA953X=y +CONFIG_SPL_DM_PCA953X=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_SPL_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS200_SUPPORT=y +CONFIG_SPL_MMC_HS200_SUPPORT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y
@@ -99,6 +114,12 @@ CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_POWER_DOMAIN=y CONFIG_TI_SCI_POWER_DOMAIN=y +CONFIG_DM_REGULATOR=y +CONFIG_SPL_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_SPL_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SPL_DM_REGULATOR_GPIO=y CONFIG_K3_SYSTEM_CONTROLLER=y CONFIG_REMOTEPROC_TI_K3_ARM64=y CONFIG_RESET_TI_SCI=y
Signature · 1 line
2.47.1
PATCH RESEND 4/7 configs: am62ax_evm_a53_defconfig: Enable MMC UHS modes
In reply to Judith MendezEnable configs required to enable MMC UHS modes in A53 SPL and U-Boot proper.
--- configs/am62ax_evm_a53_defconfig | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
configs/am62ax_evm_a53_defconfig +21 -2
@@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_K3=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2
@@ -8,6 +9,7 @@ CONFIG_SOC_K3_AM62A7=y CONFIG_TARGET_AM62A7_A53_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000 +CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am62a7-sk" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y
@@ -34,6 +36,7 @@ CONFIG_SPL_SYS_MMCSD_RAW_MODE=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_POWER_DOMAIN=y CONFIG_SPL_YMODEM_SUPPORT=y
@@ -57,10 +60,20 @@ CONFIG_CLK_TI_SCI=y CONFIG_DMA_CHANNELS=y CONFIG_TI_K3_NAVSS_UDMA=y CONFIG_TI_SCI_PROTOCOL=y -# CONFIG_GPIO is not set -# CONFIG_I2C is not set +CONFIG_SPL_DM_GPIO_LOOKUP_LABEL=y +CONFIG_DA8XX_GPIO=y +CONFIG_DM_PCA953X=y +CONFIG_SPL_DM_PCA953X=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_SPL_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS200_SUPPORT=y +CONFIG_SPL_MMC_HS200_SUPPORT=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y
@@ -74,6 +87,12 @@ CONFIG_SPL_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_POWER_DOMAIN=y CONFIG_TI_SCI_POWER_DOMAIN=y +CONFIG_DM_REGULATOR=y +CONFIG_SPL_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_SPL_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SPL_DM_REGULATOR_GPIO=y CONFIG_K3_SYSTEM_CONTROLLER=y CONFIG_REMOTEPROC_TI_K3_ARM64=y CONFIG_REMOTEPROC_TI_K3_DSP=y
Signature · 1 line
2.47.1
PATCH RESEND 5/7 configs: am62ax_evm_r5_defconfig: Enable SDHCI ADMA for r5 SPL
In reply to Judith MendezEnable SPL_MMC_SDHCI_ADMA config option for r5 SPL to improve boot time during r5 SPL stage.
--- configs/am62ax_evm_r5_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/am62ax_evm_r5_defconfig +1 -0
@@ -85,6 +85,7 @@ CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ADMA=y +CONFIG_SPL_MMC_SDHCI_ADMA=y CONFIG_MMC_SDHCI_AM654=y CONFIG_MTD=y CONFIG_PINCTRL=y
Signature · 1 line
2.47.1
PATCH RESEND 6/7 configs: am62ax_evm_a53_defconfig: Enable MMC_SPEED_MODE_SET
In reply to Judith MendezEnable MMC_SPEED_MODE_SET config option in defconfig to enable changing MMC bus modes with mmc rescan for am62ax device.
--- configs/am62ax_evm_a53_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/am62ax_evm_a53_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SPL_DM_MAILBOX=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_CMD_MMC=y +CONFIG_MMC_SPEED_MODE_SET=y CONFIG_CMD_REMOTEPROC=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y
Signature · 1 line
2.47.1
PATCH RESEND 7/7 configs: am62ax_evm_a53_defconfig: Enable SUPPORT_EMMC_BOOT
In reply to Judith MendezEnable SUPPORT_EMMC_BOOT to help support eMMC boot on am62ax device.
--- configs/am62ax_evm_a53_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/am62ax_evm_a53_defconfig +1 -0
@@ -69,6 +69,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_IO_VOLTAGE=y CONFIG_SPL_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y
Signature · 1 line
2.47.1
Quoted 11 lines · Judith Mendez
This patch series adds config options for Sitara K3 boards to support MMC UHS modes.
While testing with SD card boot and eMMC boot, found missing eMMC boot support for am62ax in
am62a7_init, patch 1/7, and missing config option to support eMMC boot.While we are here, for am62ax, enable config option to change MMC bus modes and enable r5 SDHCI ADMA for faster boot time.
Quoted 6 lines
Also for all k3 Sitara boards, cleanup MMC ENV configs that are no longer needed since we no longer load env from MMC device.
Changes since v1:
- rebase against next
Normally this would be "v2" and not "RESEND", but I really don't think we need v3 just to correct that :) I'll pick this up in due time, assuming no changes requested by others.
Signature · 1 line
Tom
Hi Tom,
Quoted 17 lines · Tom Rini
Quoted 15 lines · Judith Mendez
This patch series adds config options for Sitara K3 boards to support MMC UHS modes.
While testing with SD card boot and eMMC boot, found missing eMMC boot support for am62ax in
am62a7_init, patch 1/7, and missing config option to support eMMC boot.While we are here, for am62ax, enable config option to change MMC bus modes and enable r5 SDHCI ADMA for faster boot time.
Also for all k3 Sitara boards, cleanup MMC ENV configs that are no longer needed since we no longer load env from MMC device.
Quoted 6 lines
Quoted 2 lines
Changes since v1:
- rebase against nextNormally this would be "v2" and not "RESEND", but I really don't think we need v3 just to correct that :) I'll pick this up in due time, assuming no changes requested by others.
Understood, thanks for the feedback (:
~ Judith
Quoted 8 lines · Judith Mendez
This patch series adds config options for Sitara K3 boards to support MMC UHS modes.
While testing with SD card boot and eMMC boot, found missing eMMC boot support for am62ax in
am62a7_init, patch 1/7, and missing config option to support eMMC boot.[...]
Applied to u-boot/next, thanks!
Signature · 1 line
Tom