From nobody Tue Apr 7 08:51:52 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B54223750D9 for ; Sun, 15 Mar 2026 17:17:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595022; cv=none; b=dpqe6T4IbbYCrT43Z5pgvQcMVUeWxktD2yfr0feJaGZu30PssrYJh4tUzqaF+ORJUdxIEIlTnoj18bTKi4eMqI1MsjI0YgX6RP+I9D2rle0PUJS/NYNotW6dZdQxKNynVbnnGDKk5Q5yJpZzBFAfN2ckzce51lZseCC5aHnFhLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595022; c=relaxed/simple; bh=X32PXM6CIYzypQR5TwfD7Jn/cbq77OlrCWR99DHxUpQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VcbDVsngojzJm/2byi+Gz7u/6K7ZKsTLrWFMDi0+r+NdC6s4jJd3imB+Srs6LVDwY6s4Qdlp5nyJCVpuBQu6V2huXqAp5YRD5Eyw9TqFgb2OptsSV8BgHvhDVff4chbW7umjzsIYsZaO+AiIoGG7tJwoCnYabNjh+LLNu/9O2Hk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bkP3s57m; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bkP3s57m" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-43b44c0bcdbso53031f8f.1 for ; Sun, 15 Mar 2026 10:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773595019; x=1774199819; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ubQ1v6PBsq99cAcF2yrnS1WsB85d1f/acmJVUU/lg1s=; b=bkP3s57mdv06Q8pGVWI4sO1FcTTW0j4zh+8kzK4R0Kpp+g8bHG1yntDaZr+QWoE5BZ +CtFml9JkkNytDIZEJqKa4MeJ3m4zFKaZt0klCzfeZaEo1KCiakxbgaV2NoKjnXU7otn rr+SYvK4ssEnc1oxI0xCByyWzzsTFU41my6/fvn0ZdD5hhoQe1sSv1jsT58Bf0ByHtj+ WvL2wSTQ27qYrzk1BjsVr9PCQvp0NF/1ESdZsOUxwR0KjvVwLsvfIGDUdPgSiOVVkEzn MupnbYA45bC946+Fh0djNXW66NMPP/1gYgk+JFKeCz4keggXKP0N9sdY99ByzigsffOF Rx+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773595019; x=1774199819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ubQ1v6PBsq99cAcF2yrnS1WsB85d1f/acmJVUU/lg1s=; b=DXg6X6UeboeI+GikS5eB+icq7BLNwJS2hdYCib4TWwQVpucuvRt5KEPYLcrVktIu7M sBXytZNYvUlCKoauqzoPNDnI5KcaOms5v/An1as4vssoBmqThzf2AS5w4F+SEnWEOSY/ pWCuQFocdkN5vMiWUKR40DwRelDHPYmn1s5hxCjiT2G8KHf2H/heG52HDsVirZSS2YSN TFZkai67TLvSbfPXDPXgwCjG8Pn384W4XKiuC/c5YDdKx+HKusy3qDiYxGUsXsJfvcek GqM0AyI5AboShTOPJQQq5BXTsZwYipZHT2YwAjLSk3y8hlgfKBuYtqmMmtHewZ2H6KSf AkQg== X-Forwarded-Encrypted: i=1; AJvYcCWnA5UVy/tvHeQfxF6hJudkTXAkWa3Asx2Z8MmDkdx0nWzsyAE148GgQ/jqrJrCYr5UzAARHKZOJ+nNokU=@vger.kernel.org X-Gm-Message-State: AOJu0YywZ2GVmuObHpfeyacR0P8eXIFwNHcedWZlMO88YcxmeZY5qhDT 2bmwkMxEBzR7q/v+08gJCViEaZ99DBWJDyVefdDqtfaXrj8zp8OT0vBE X-Gm-Gg: ATEYQzzCYPejxk/Ur9sy1EN10zhQgepbonB8Tj7ZVNk3Ngmbg1+HE4WU5NgacpuMtV+ lhSeZYEnOZiOynRxKpXza7LAqrrKmL6lrDy6R6J4lvIygyPfGVwKOxJp5dCJpu2JaD5OzWg3vVL IvuJLyAbxAWQydDd59vBwqvX8q1WzuXtsGCgW4xWfxdzRQGidIfyqzfRtDsrZITZ5JW2390VY+H lkeuWiYyl/uIZUF8xhqU+Sdox9T76GM5TW3j5VmlUzw5GA2irbKD/lJcoOIbuEXBYLpG8jC3yAH nv7g+wq8pq9dB1lyBh/8y9oiQ5oBIxyb4sW2OA6m1oI0R51ZuL38GaT+daRGvDFpEa1wvEO38ZE 4ni1rJ7LZG2GDo2LBtLjn/CnGdPckRE/DA8EhobCoc6cbEOC5+KwJ3L0xp7gXz9ITVgm16bwiJa qc6fWstxb6vWhdAtHucrfInzAJ7v2/ghoqKw== X-Received: by 2002:a05:6000:200f:b0:439:b59e:5e65 with SMTP id ffacd0b85a97d-43a04d79252mr18547646f8f.6.1773595018822; Sun, 15 Mar 2026 10:16:58 -0700 (PDT) Received: from debian.lan ([171.22.84.130]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe21b631sm40536429f8f.27.2026.03.15.10.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 10:16:58 -0700 (PDT) From: Adrian Garcia Cicuelo X-Google-Original-From: Adrian Garcia Cicuelo To: Ulf Hansson , Adrian Hunter , Andreas Hindborg , Jens Axboe , Miri Korenblit Cc: Miguel Ojeda , Haibo Chen , Frank Li , Sascha Hauer , Boqun Feng , linux-mmc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Adrian Garcia Cicuelo Subject: [PATCH v2 1/3] mmc: sdhci-esdhc-imx: consolidate imx25/35 data and add Kingston CID Date: Sun, 15 Mar 2026 18:16:50 +0100 Message-ID: <20260315171652.269020-2-adriangarciacicuelo@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315171652.269020-1-adriangarciacicuelo@gmail.com> References: <20260315171652.269020-1-adriangarciacicuelo@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Consolidate esdhc_imx25 and esdhc_imx35 soc data into a single shared struct since they share the same flags. This reduces redundancy. Also add the CID_MANFID_KINGSTON definition to quirks.h for centralized management. Signed-off-by: Adrian Garcia Cicuelo --- drivers/mmc/core/quirks.h | 4 ++++ drivers/mmc/host/sdhci-esdhc-imx.c | 12 ++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index c417ed34c..d736bb4be 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -15,6 +15,10 @@ =20 #include "card.h" =20 +#ifndef CID_MANFID_KINGSTON +#define CID_MANFID_KINGSTON 0x70 +#endif + static const struct mmc_fixup __maybe_unused mmc_sd_fixups[] =3D { /* * Kingston Canvas Go! Plus microSD cards never finish SD cache flush. diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-es= dhc-imx.c index a7a5df673..9cfa26722 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -256,11 +256,7 @@ struct esdhc_soc_data { u32 quirks; }; =20 -static const struct esdhc_soc_data esdhc_imx25_data =3D { - .flags =3D ESDHC_FLAG_ERR004536, -}; - -static const struct esdhc_soc_data esdhc_imx35_data =3D { +static const struct esdhc_soc_data esdhc_imx25_35_data =3D { .flags =3D ESDHC_FLAG_ERR004536, }; =20 @@ -391,8 +387,8 @@ struct pltfm_imx_data { }; =20 static const struct of_device_id imx_esdhc_dt_ids[] =3D { - { .compatible =3D "fsl,imx25-esdhc", .data =3D &esdhc_imx25_data, }, - { .compatible =3D "fsl,imx35-esdhc", .data =3D &esdhc_imx35_data, }, + { .compatible =3D "fsl,imx25-esdhc", .data =3D &esdhc_imx25_35_data, }, + { .compatible =3D "fsl,imx35-esdhc", .data =3D &esdhc_imx25_35_data, }, { .compatible =3D "fsl,imx51-esdhc", .data =3D &esdhc_imx51_data, }, { .compatible =3D "fsl,imx53-esdhc", .data =3D &esdhc_imx53_data, }, { .compatible =3D "fsl,imx6sx-usdhc", .data =3D &usdhc_imx6sx_data, }, @@ -414,7 +410,7 @@ MODULE_DEVICE_TABLE(of, imx_esdhc_dt_ids); =20 static inline int is_imx25_esdhc(struct pltfm_imx_data *data) { - return data->socdata =3D=3D &esdhc_imx25_data; + return data->socdata =3D=3D &esdhc_imx25_35_data; } =20 static inline int is_imx53_esdhc(struct pltfm_imx_data *data) --=20 2.47.3