On Wed, Jan 07, 2026 at 09:12:50AM +0800, zhengxiaojun wrote:
> Resolve conflict between MMC_CAP_NONREMOVABLE and MMC_CAP_1_8V_DDR.
>
> Signed-off-by: zhengxiaojun <zheng.xiaojun at foxmail.com>
Added while applying:
Fixes: a382be0b4f ("mci: add option to detect non-removable cards during
startup")
Sascha
> ---
> include/mci.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/mci.h b/include/mci.h
> index 3db33f9142..50214aaae7 100644
> --- a/include/mci.h
> +++ b/include/mci.h
> @@ -58,7 +58,7 @@
> #define MMC_CAP_1_2V_DDR (1 << 9) /* Host supports eMMC
> DDR 1.2V */
> #define MMC_CAP_DDR (MMC_CAP_3_3V_DDR | MMC_CAP_1_8V_DDR | \
> MMC_CAP_1_2V_DDR)
> -#define MMC_CAP_NONREMOVABLE (1 << 8) /* Nonremovable e.g.eMMC */
> +#define MMC_CAP_NONREMOVABLE (1 << 10) /* Nonremovable e.g. eMMC */
> #define MMC_CAP_UHS_SDR12 (1 << 16) /* Host supports UHS SDR12 mode
> */
> #define MMC_CAP_UHS_SDR25 (1 << 17) /* Host supports UHS SDR25 mode
> */
> #define MMC_CAP_UHS_SDR50 (1 << 18) /* Host supports UHS SDR50 mode
> */
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
