From nobody Tue Apr 7 09:20:53 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 1F2A1377EC0 for ; Sun, 15 Mar 2026 17:28:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595684; cv=none; b=bzx5bnQNW3p7uGH8JzIk5A0CSuW2xCJ5Rey4PpVZTE0CQ9t+JUcW9WQ0TVhiNfeBhya6homoarxlwni7xYj6D52vu3FiPV/D4LDrRqoMyI9unk61THRAN2uA2R2EG6hKdnv2ypF40YKubTU7nXmrqnSynbU4UNEfjFOq80TZdxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595684; c=relaxed/simple; bh=QyIuFOJZx926p9XhEzOqnlY0Tjj4EaWSbZ1NmZeyRpg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eJuR2CyBOj4SADhXsdBsie67GDgu0+S+1GM3NurCbQYN9HNYI7H3Ej0QYLgaVO45oNFLK/IS2/gZdr5C/vcvEVMUPpTVUPdFxYPV8Iiri1EaiYGGViTNpwZqrRc/ywJYnBUp/zs5edp09WauRDKOlC/V+8p1tpHXvcfYHOeARBc= 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=KaftvYRw; arc=none smtp.client-ip=209.85.128.43 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="KaftvYRw" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so34430425e9.2 for ; Sun, 15 Mar 2026 10:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773595681; x=1774200481; 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=YIEg7cppvNlK1uJeRyCMqJFg9lbXRMhPBqnGtbbFM64=; b=KaftvYRwTkpwOyTOTR15hx72rP9U1+qsLRZwEpP0661vgIcqr3lg7EBVrhFxsnDwAW Ft3pAkQ+cP+XZtoiuCfViQGC+f/xf+2KTA2ggxz5v58oydL3P7jTYsWtexLlQIABT61c +p5UefG2DSeCjHyaUBPTYrFFFWrTXfWlct6SnQ3KuaemwET/LzDtFMb0ppqS5oxjCSmo LrMikbM9yaN+4a8pBiuoJda4Anh/iYvhBtUjFlKJmXk6hZiSGZ6nCOf7rZg0dTSv7H9e zm4zmFnWaJ6yHQcjovyZ8OTAGLBPYHXB89ydhmt6rdNd0tBkYjoIWYYI86Pv3sCq5YoN Ru+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773595681; x=1774200481; 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=YIEg7cppvNlK1uJeRyCMqJFg9lbXRMhPBqnGtbbFM64=; b=ovRfFSouhgb9M5MqxmjzWAv9fNW0KJVR5mLe3q0onj11jiWWnwIwtQvAobiIenkg8R PX34OlAHYv8vdoiSgJuGjwcWiZdk0sJecrHNdvaZHQRQM+GBGbC9g0UOijZvny5Fi5NN E1FOmnhMgY192wRpIy5NvWL4sp41QEMmLgM5jc6g+Ejevh84d3EPImkC8QB61x/mLmuh jANj11hS7dVH7yRFlWJ06OKo7qITgchiNMiL8Vt+/Ny1SHK1R0VswZRUc15lfu+kzWrJ w4ExktNHdyHYNqSDITwcorq2Ea4y1ruLBIGgWuo2dJH/H0KTDl9MD81pxEZNrQtZbzDg YsQg== X-Forwarded-Encrypted: i=1; AJvYcCW0UZblSsfcHW79MMWbCe9V4YJ6qwJeLVJ4u1VL4+3DNQuTbuB4u0ZpxcPTL2Gh3XCI3DBGTpOAFZ1FIVg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+zV4uqyLuZVKA51y+ZtqHerTdQLBrJu0ZprfpsLuOlp65hjiM HRyFL5Vd8ZtM+iteUyo6XrqYWWHPZROhZBudgNLcoMegVpFb7EpKm0mJ X-Gm-Gg: ATEYQzyeDMEIbctQq7XFEj73ejfAfXIXpZVWqyIFzCxjvx25FU6+ShRKnDsC771dhJt Jp2M6YG1U47+UrDd1JiLBmdxg8MioHtQif8pE5tpu13uq/UisB0el90nzb9bgBgouD8yD0WVQ+Q E53kIUGKcmQHH3YqOpYR70v7jXWG4BZDH0cHGc+Whu0ZLBIStkc6q30NF52ILlQuJgq8G4Atn5y M+ungpqc/4ekvugbB2wRa3mjbXkAM676xbnjl3APfAFqun2FiydEEh6wuFUfn/mL9qc1CGjgJi2 h3VkW2DXBK8joyIy+A7pqgKiKwbo/vJrpKBPYk8b/Mt2CpobEGpGy7oJ21nc8KenI1YZgTXYVSL nMkKow0ZDll5FaaNhiOKmHEyhcr4VIUIQGKn4xr6ciWaeaobuhbnuwIbYwVPw81NYZIjYOW06nr bGC3iDOW0BWOfFA+NsE5VAvWEeFBh4QvoYapk= X-Received: by 2002:a05:600c:64cf:b0:477:561f:6fc8 with SMTP id 5b1f17b1804b1-485566cf81fmr167182995e9.5.1773595681386; Sun, 15 Mar 2026 10:28:01 -0700 (PDT) Received: from debian.lan ([171.22.84.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48557c6586csm73644905e9.20.2026.03.15.10.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 10:28:00 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= 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, =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= , =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= Subject: [PATCH v2 3/3] mmc: sdhci-esdhc-imx: consolidate imx25/35 data and add Kingston CID Date: Sun, 15 Mar 2026 18:26:40 +0100 Message-ID: <20260315172746.270734-4-adriangarciacasado42@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315172746.270734-1-adriangarciacasado42@gmail.com> References: <20260315172746.270734-1-adriangarciacasado42@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: Adri=C3=A1n Garc=C3=ADa Casado --- 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