diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-16 21:20:51 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-16 21:20:51 +0300 |
| commit | d7bb6aceb2e99a832efbb96f9bf480bf95602192 (patch) | |
| tree | d5fe9be238587a396466282a1e8a22e6c4312c34 /include | |
| parent | 994bb86fc90aa9edff5a6685b28b44e2f77de196 (diff) | |
| parent | 26632b7541e85b24b86bc0188123a403eeee44d1 (diff) | |
| download | u-boot-d7bb6aceb2e99a832efbb96f9bf480bf95602192.tar.xz | |
Merge tag 'mmc-1-16-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- Cleanup of fsl_esdhc driver together with arch/defconfig change
- Add quirk for APP_CMD retry
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/T1040QDS.h | 1 | ||||
| -rw-r--r-- | include/configs/T208xQDS.h | 1 | ||||
| -rw-r--r-- | include/e500.h | 1 | ||||
| -rw-r--r-- | include/mmc.h | 1 |
4 files changed, 1 insertions, 3 deletions
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index b8456984e2..aa2a8b00de 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -481,7 +481,6 @@ unsigned long get_board_ddr_clk(void); #endif #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_FSL_ESDHC_ADAPTER_IDENT #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 2078b9d369..be5a658d7e 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -630,7 +630,6 @@ unsigned long get_board_ddr_clk(void); * SDHC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 diff --git a/include/e500.h b/include/e500.h index 1acf7784df..255f46bf1e 100644 --- a/include/e500.h +++ b/include/e500.h @@ -18,7 +18,6 @@ typedef struct unsigned long freq_ddrbus; unsigned long freq_localbus; unsigned long freq_qe; - unsigned long freq_sdhc; #ifdef CONFIG_SYS_DPAA_FMAN unsigned long freq_fman[CONFIG_SYS_NUM_FMAN]; #endif diff --git a/include/mmc.h b/include/mmc.h index 1a9efe4c38..b5cb514f57 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -331,6 +331,7 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx) #define MMC_QUIRK_RETRY_SEND_CID BIT(0) #define MMC_QUIRK_RETRY_SET_BLOCKLEN BIT(1) +#define MMC_QUIRK_RETRY_APP_CMD BIT(2) enum mmc_voltage { MMC_SIGNAL_VOLTAGE_000 = 0, |