Skip to contentSkip to conversation

FAILED: patch "[PATCH] mmc: sdhi: disallow HS400 for M3-W ES1.2, RZ/G2M, and V3H" failed to apply to 4.19-stable tree

PATCH [email protected] 1 participant 1 message Jun 23, 2019

Subsystems (3)
Stable branch MMC, SD and SDIO TMIO/SDHI MMC driver
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 97bf85b6ec9e6597ce81c79b26a28f7918fc4eaf Mon Sep 17 00:00:00 2001
From: Wolfram Sang <[email protected]>
Date: Thu, 6 Jun 2019 13:35:35 +0200
Subject: [PATCH] mmc: sdhi: disallow HS400 for M3-W ES1.2, RZ/G2M, and V3H
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our HW engineers informed us that HS400 is not working on these SoC revisions.

Fixes 0f4e2054c971 ("mmc: renesas_sdhi: disable HS400 on H3 ES1.x and M3-W ES1.[012]")
Signed-off-by Wolfram Sang <[email protected]>
Reviewed-by Geert Uytterhoeven <[email protected]>
Reviewed-by Fabrizio Castro <[email protected]>
Reviewed-by Niklas Söderlund <[email protected]>
Cc [email protected]
Signed-off-by Ulf Hansson <[email protected]>
drivers/mmc/host/renesas_sdhi_core.c +7 -2
index 5e9e36ed2107..5f8d57ac084f 100644
@@ -620,11 +620,16 @@ static const struct renesas_sdhi_quirks sdhi_quirks_h3_es2 = {
 	.hs400_4taps = true,
 };
 
+static const struct renesas_sdhi_quirks sdhi_quirks_nohs400 = {
+	.hs400_disabled = true,
+};
+
 static const struct soc_device_attribute sdhi_quirks_match[]  = {
 	{ .soc_id = "r8a7795", .revision = "ES1.*", .data = &sdhi_quirks_h3_m3w_es1 },
 	{ .soc_id = "r8a7795", .revision = "ES2.0", .data = &sdhi_quirks_h3_es2 },
-	{ .soc_id = "r8a7796", .revision = "ES1.0", .data = &sdhi_quirks_h3_m3w_es1 },
-	{ .soc_id = "r8a7796", .revision = "ES1.1", .data = &sdhi_quirks_h3_m3w_es1 },
+	{ .soc_id = "r8a7796", .revision = "ES1.[012]", .data = &sdhi_quirks_h3_m3w_es1 },
+	{ .soc_id = "r8a774a1", .revision = "ES1.[012]", .data = &sdhi_quirks_h3_m3w_es1 },
+	{ .soc_id = "r8a77980", .data = &sdhi_quirks_nohs400 },
 	{ /* Sentinel. */ },
 };