leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert CONFIG_FSL_ESDHC_PIN_MUX to Kconfig

Browse Source 
This converts the following to Kconfig:
   CONFIG_FSL_ESDHC_PIN_MUX

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-12-02 16:42:22 -05:00
parent 3a581af21a
commit 5388aa2851
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/MPC837XERDB_defconfig
View File

@ -195,6 +195,7 @@ CONFIG_SYS_FSL_I2C_OFFSET=0x3000
CONFIG_SYS_I2C_SLAVE=0x7F CONFIG_SYS_I2C_SLAVE=0x7F
CONFIG_SYS_I2C_SPEED=400000 CONFIG_SYS_I2C_SPEED=400000
CONFIG_FSL_ESDHC=y CONFIG_FSL_ESDHC=y
CONFIG_FSL_ESDHC_PIN_MUX=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y CONFIG_FLASH_CFI_DRIVER=y
CONFIG_FLASH_SHOW_PROGRESS=0 CONFIG_FLASH_SHOW_PROGRESS=0

4
drivers/mmc/Kconfig
View File

@ -891,6 +891,10 @@ config FSL_USDHC
help help
This enables the Ultra Secured Digital Host Controller enhancements This enables the Ultra Secured Digital Host Controller enhancements
config FSL_ESDHC_PIN_MUX
bool "Perform esdhc device-tree fixup"
depends on (FSL_ESDHC || FSL_ESDHC_IMX) && OF_LIBFDT
endmenu endmenu
config SYS_FSL_ERRATUM_ESDHC111 config SYS_FSL_ERRATUM_ESDHC111

2
drivers/mmc/fsl_esdhc_imx.c
View File

@ -1360,7 +1360,7 @@ int fsl_esdhc_mmc_init(struct bd_info *bis)
#if CONFIG_IS_ENABLED(OF_LIBFDT) #if CONFIG_IS_ENABLED(OF_LIBFDT)
__weak int esdhc_status_fixup(void *blob, const char *compat) __weak int esdhc_status_fixup(void *blob, const char *compat)
{ {
if (IS_ENABLED(FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) { if (IS_ENABLED(CONFIG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
do_fixup_by_compat(blob, compat, "status", "disabled", do_fixup_by_compat(blob, compat, "status", "disabled",
sizeof("disabled"), 1); sizeof("disabled"), 1);
return 1; return 1;

1
include/configs/MPC837XERDB.h
View File

@ -177,7 +177,6 @@
#define CFG_SYS_PCIE2_IO_PHYS 0xD8000000 #define CFG_SYS_PCIE2_IO_PHYS 0xD8000000
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC_PIN_MUX
#define CFG_SYS_FSL_ESDHC_ADDR CFG_SYS_MPC83xx_ESDHC_ADDR #define CFG_SYS_FSL_ESDHC_ADDR CFG_SYS_MPC83xx_ESDHC_ADDR
#endif #endif