From nobody Mon Apr 6 10:45:09 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.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 B787A3939DF for ; Thu, 19 Mar 2026 17:38:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773941924; cv=none; b=bRsD4n/KBSxuBEhmL5/qEFq6Dxb4a0+I9HbsG3+yjoouu+2hzScFNOIG+5tPPlSl1Aa2+4At8Op04BsokFVgcs+IyT8pU0CcfaGjgkLah8m0WOrySbXBhc8NDcML9laBZr/9E+x5Dj0j6BCZZyUaj8Jv7w9B0U/FiECj7AcqKzI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773941924; c=relaxed/simple; bh=wtcwSax+dOymKeDwOFVuIu38JkEr2pWeDdK1+wJVZU8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=nV4xvTEot8Huh5Ak4J6uMQWYRDlT1wjqw1QGTK1fvNaafk9cKRR/p3Xm0hhV6Heufifdi/4AGPFJOAa+QfKP692AhFREnZbAM7+Nbc2WOXKWviJou1KiiZA2nocL9W943b02nAOZv7VnDoPFqACxF9/zlrR8/mcn8bp54fpyoAs= 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=Q0Idp25W; arc=none smtp.client-ip=209.85.128.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="Q0Idp25W" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-482f454be5bso22874105e9.0 for ; Thu, 19 Mar 2026 10:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773941918; x=1774546718; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2dck90428BvoqEpkmWusaTQb8k98b4TyQG0pbU+HYgI=; b=Q0Idp25W1oFZdQf/AFGKt4I4gp8+vcUCQnwaw+0wiiR1ZTjWo/sw8q5QdbIDXjR3hI gEY43KmcbvFEM8JmuCKXesN2aXwBi5dHTGI4yAy47+2Bb/q9wVEmOPA9rB9U7/ZjF39C qh6e0sZSEummOcg8AA4v3VJZDTJGeIkEZG8yZIwgAwXgVBhfDWCAb0XC/KDGQUE+vzX3 Jnyj+cwITrzbnLNe2W6oUQey++PyzSRu5HghnNDiK6qtpjZ3T2rXYi6BsWbTXG75Zg+K LnblSJoqiRwfKmOkmICmC5xkATDXo/r4y7tzOT2mEppI1pUNEAxLxGxnV4lZI5Ns7Xpw JAkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773941918; x=1774546718; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2dck90428BvoqEpkmWusaTQb8k98b4TyQG0pbU+HYgI=; b=Pvc7GTouLPdvI9EiCACWtAMhtnVvmunDwF879HJSO2/E6TjXnq3ilb45nwkFiCUU31 e6HX/CUpwdFE0DSGfYQHcAHrrZrp3K5cWdtqJdk7RWgG1SlP+bTjuX7ZorsuNNjjyCYb rVz2HviI4PqncHtXDEOjaTsqO7hUNl/VcnuzUe9Gy38lgJtjuFj0qksjxEe/7M9tA5CA G6wBUeO4bfALOzdYdx2KD2vGXI3rPPxJiFGjqmxrAOY32SljGKhNMUkLB7UHpH+x7+3J ShXm0qu10f7w/hjkVVRyDgMF/hNQTQr28N7SClzom1zA4bKKqxtYBpQlxrJyE4fHpcWs DvKA== X-Forwarded-Encrypted: i=1; AJvYcCV9UX41eepnVG1SNghKVL27kvGIn68BQejR0CHZIhwjqyGNHd8uTKIfsq7AX2uddOusDUQK3Xn9ZflLEWg=@vger.kernel.org X-Gm-Message-State: AOJu0YyFTiwfbim6r6ybCTkN9NwJJFSklHPSjqNyBcJg8t6UnJjJmmUJ FOS/PAqKFApY9J1T3hc27UrnBC9MNRF9fqrQPsJ0ukq+t/MkQHIeQPaY X-Gm-Gg: ATEYQzyjSoC1Dl/ZbNoMMymG9ezJpibYX6a46MkIdiGF/xsLTSKZF8Ke6l6T9acLc3n FJQBRtp6cml/VKhk+VmCIYboLTiqtGCNgIxSI3lCp2TX1t74Nwnh6VB3iOYaPZcl2O1Zeb/5ZhG KeZ/wXCmCzaXYbl728WGT9k0pP/S+qIVaTR1TzcjXMkLXGmEMKSEwvn70/yh8fXIzilmPNkmpg4 27P+Y5D0j5ynmHrX0noh5GYBUGd3E5xj+fNg2ddz5mQYB/TPi6SQF0GNTJiuN+CfLpjPakmtqHB oY8n4jOnl95feUDTtUsVnXe1myFbjcpZescvS/4GFZ9PwgMSSUhdUWY/Heor2ecEoR5PfIpIlmp waGFtpJxw6uN9m5ggZlx3Hu8I53zi7XFJPqCLYLzcYJx2y6JRrG7miuiYomm9UZINq9fdMBQdNl EOohuyu2Ja8vm5k5Pv4uGJiYpanmPkIeJjGw== X-Received: by 2002:a05:600c:55d7:b0:485:4f11:aabc with SMTP id 5b1f17b1804b1-486f8b80e07mr59487305e9.15.1773941917725; Thu, 19 Mar 2026 10:38:37 -0700 (PDT) Received: from debian.lan ([171.22.85.208]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b646b0d3dsm212845f8f.16.2026.03.19.10.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 10:38:37 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= To: Ulf Hansson Cc: Haibo Chen , Frank Li , Sascha Hauer , linux-mmc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Miguel Ojeda , =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= Subject: [PATCH v6] mmc: sdhci-esdhc-imx: remove redundant mx25 handling and consolidate soc data Date: Thu, 19 Mar 2026 18:38:32 +0100 Message-ID: <20260319173832.15543-1-adriangarciacasado42@gmail.com> X-Mailer: git-send-email 2.47.3 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 Remove the is_imx25_esdhc check and redundant mx25-specific handling as it'= s no longer necessary since the new_soc initialization. Consolidate the dri= ve data structs for imx25/35. Signed-off-by: Adri=C3=A1n Garc=C3=ADa Casado --- drivers/mmc/host/sdhci-esdhc-imx.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-es= dhc-imx.c index a7a5df673b0f6..3dc43f1e517aa 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, }, @@ -412,10 +408,6 @@ static const struct of_device_id imx_esdhc_dt_ids[] = =3D { }; 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; -} =20 static inline int is_imx53_esdhc(struct pltfm_imx_data *data) { @@ -873,11 +865,8 @@ static void esdhc_writeb_le(struct sdhci_host *host, u= 8 val, int reg) new_val =3D val & SDHCI_CTRL_LED; /* ensure the endianness */ new_val |=3D ESDHC_HOST_CONTROL_LE; - /* bits 8&9 are reserved on mx25 */ - if (!is_imx25_esdhc(imx_data)) { - /* DMA mode bits are shifted */ - new_val |=3D (val & SDHCI_CTRL_DMA_MASK) << 5; - } + /* DMA mode bits are shifted */ + new_val |=3D (val & SDHCI_CTRL_DMA_MASK) << 5; =20 /* * Do not touch buswidth bits here. This is done in base-commit: f338e77383789c0cae23ca3d48adcc5e9e137e3c prerequisite-patch-id: bf56dcdce62cb97741b7aa11b04c7a9648fb2d6a prerequisite-patch-id: bb57e0fd9cad8c81bcf7a6389f3cb294bbe1eb52 --=20 2.47.3