Merge tag 'u-boot-at91-fixes-2023.10-a' of https://source.denx.de/u-boot/custodians/u-boot-at91
First set of u-boot-atmel fixes for the 2023.07 cycle: This small fixes set includes the LTO configs for the boards that had the SPL size up to the limit (sama5d2-based), such that more code can be added. It also includes a fix for mmc non-removable.
This commit is contained in:
@@ -27,6 +27,7 @@ CONFIG_SPL_FS_FAT=y
|
||||
CONFIG_SPL_LIBDISK_SUPPORT=y
|
||||
CONFIG_SYS_LOAD_ADDR=0x22000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_LTO=y
|
||||
CONFIG_ENV_VARS_UBOOT_CONFIG=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_SD_BOOT=y
|
||||
|
||||
@@ -28,6 +28,7 @@ CONFIG_SPL_FS_FAT=y
|
||||
CONFIG_SPL_LIBDISK_SUPPORT=y
|
||||
CONFIG_SYS_LOAD_ADDR=0x22000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_LTO=y
|
||||
CONFIG_ENV_VARS_UBOOT_CONFIG=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_SD_BOOT=y
|
||||
|
||||
@@ -29,6 +29,7 @@ CONFIG_SPL_FS_FAT=y
|
||||
CONFIG_SPL_LIBDISK_SUPPORT=y
|
||||
CONFIG_SYS_LOAD_ADDR=0x22000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_LTO=y
|
||||
CONFIG_ENV_VARS_UBOOT_CONFIG=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_SD_BOOT=y
|
||||
|
||||
@@ -29,6 +29,7 @@ CONFIG_SPL_FS_FAT=y
|
||||
CONFIG_SPL_LIBDISK_SUPPORT=y
|
||||
CONFIG_SYS_LOAD_ADDR=0x22000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_LTO=y
|
||||
CONFIG_ENV_VARS_UBOOT_CONFIG=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_QSPI_BOOT=y
|
||||
|
||||
@@ -31,6 +31,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
CONFIG_SPL_SPI=y
|
||||
CONFIG_SYS_LOAD_ADDR=0x22000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_LTO=y
|
||||
CONFIG_ENV_VARS_UBOOT_CONFIG=y
|
||||
CONFIG_FIT=y
|
||||
CONFIG_SPI_BOOT=y
|
||||
|
||||
@@ -15,6 +15,9 @@
|
||||
#define ATMEL_SDHC_MIN_FREQ 400000
|
||||
#define ATMEL_SDHC_GCK_RATE 240000000
|
||||
|
||||
#define ATMEL_SDHC_MC1R 0x204
|
||||
#define ATMEL_SDHC_MC1R_FCD 0x80
|
||||
|
||||
#ifndef CONFIG_DM_MMC
|
||||
int atmel_sdhci_init(void *regbase, u32 id)
|
||||
{
|
||||
@@ -52,11 +55,37 @@ struct atmel_sdhci_plat {
|
||||
struct mmc mmc;
|
||||
};
|
||||
|
||||
static void atmel_sdhci_config_fcd(struct sdhci_host *host)
|
||||
{
|
||||
u8 mc1r;
|
||||
|
||||
/* If nonremovable, assume that the card is always present.
|
||||
*
|
||||
* WA: SAMA5D2 doesn't drive CMD if using CD GPIO line.
|
||||
*/
|
||||
if ((host->mmc->cfg->host_caps & MMC_CAP_NONREMOVABLE)
|
||||
#if CONFIG_IS_ENABLED(DM_GPIO)
|
||||
|| dm_gpio_get_value(&host->cd_gpio) >= 0
|
||||
#endif
|
||||
) {
|
||||
sdhci_readb(host, ATMEL_SDHC_MC1R);
|
||||
mc1r |= ATMEL_SDHC_MC1R_FCD;
|
||||
sdhci_writeb(host, mc1r, ATMEL_SDHC_MC1R);
|
||||
}
|
||||
}
|
||||
|
||||
static int atmel_sdhci_deferred_probe(struct sdhci_host *host)
|
||||
{
|
||||
struct udevice *dev = host->mmc->dev;
|
||||
int ret;
|
||||
|
||||
return sdhci_probe(dev);
|
||||
ret = sdhci_probe(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
atmel_sdhci_config_fcd(host);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct sdhci_ops atmel_sdhci_ops = {
|
||||
@@ -120,7 +149,13 @@ static int atmel_sdhci_probe(struct udevice *dev)
|
||||
|
||||
clk_free(&clk);
|
||||
|
||||
return sdhci_probe(dev);
|
||||
ret = sdhci_probe(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
atmel_sdhci_config_fcd(host);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int atmel_sdhci_bind(struct udevice *dev)
|
||||
|
||||
Reference in New Issue
Block a user