From: Sascha Hauer <s.hauer@pengutronix.de>
To: zhengxiaojun <zheng.xiaojun@foxmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] mmc: resolve conflict between MMC_CAP_NONREMOVABLE and MMC_CAP_1_8V_DDR
Date: Wed, 7 Jan 2026 08:45:55 +0100 [thread overview]
Message-ID: <aV4PMxDOuiHZh7ks@pengutronix.de> (raw)
In-Reply-To: <tencent_C5E0959753A838615BF48C3792E12BC74A08@qq.com>
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 |
next prev parent reply other threads:[~2026-01-07 7:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-07 1:12 zhengxiaojun
2026-01-07 7:45 ` Sascha Hauer
2026-01-07 7:45 ` Sascha Hauer [this message]
2026-01-07 9:43 ` Ahmad Fatoum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aV4PMxDOuiHZh7ks@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=zheng.xiaojun@foxmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox