PKGBUILDs/core/linux-armv5/0007-Fix-mvsdio-SD-card-detection.patch

71 lines
2.1 KiB
Diff
Raw Normal View History

2019-07-08 23:47:26 +00:00
From 047ad05a8305c3346806aa87777197268560b071 Mon Sep 17 00:00:00 2001
2018-04-03 01:05:04 +00:00
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 25 Feb 2018 16:38:04 -0700
Subject: [PATCH 7/9] Fix mvsdio SD card detection
Helps SD card detection on PPv4.
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
---
drivers/mmc/core/core.c | 2 +-
drivers/mmc/core/sd.c | 9 +++++++++
drivers/mmc/host/mvsdio.c | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
2019-07-08 23:47:26 +00:00
index 6db36dc870b5..7aa4d670ff37 100644
2018-04-03 01:05:04 +00:00
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
2019-07-08 23:47:26 +00:00
@@ -714,7 +714,7 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
2018-04-03 01:05:04 +00:00
*/
limit_us = 3000000;
else
- limit_us = 100000;
+ limit_us = 200000;
/*
* SDHC cards always use these fixed values.
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
2019-07-08 23:47:26 +00:00
index d3d32f9a2cb1..c4d0797c8ad2 100644
2018-04-03 01:05:04 +00:00
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
2019-07-08 23:47:26 +00:00
@@ -379,6 +379,15 @@ int mmc_sd_switch_hs(struct mmc_card *card)
2018-04-03 01:05:04 +00:00
if (!status)
return -ENOMEM;
+ /*
+ * Some SDHC cards, notably those with a Sandisk SD controller
+ * (also found in Kingston products) need a bit of slack
+ * before successfully handling the SWITCH command. So far,
+ * cards identifying themselves as "SD04G" and "SD08G" are
+ * affected
+ */
+ udelay(100);
+
err = mmc_sd_switch(card, 1, 0, 1, status);
if (err)
goto out;
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
2019-07-08 23:47:26 +00:00
index 9cb93e15b197..257040ddde4c 100644
2018-04-03 01:05:04 +00:00
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -23,6 +23,7 @@
#include <linux/of_irq.h>
#include <linux/mmc/host.h>
#include <linux/mmc/slot-gpio.h>
+#include <linux/mmc/sd.h>
2019-07-08 23:47:26 +00:00
#include <linux/sizes.h>
2018-04-03 01:05:04 +00:00
#include <asm/unaligned.h>
2019-07-08 23:47:26 +00:00
@@ -150,6 +151,7 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
2018-04-03 01:05:04 +00:00
dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n",
cmd->opcode, mvsd_read(MVSD_HW_STATE));
+ if (cmd->opcode == SD_SWITCH) mdelay(1); /* Voodoo */
cmdreg = MVSD_CMD_INDEX(cmd->opcode);
--
2019-07-08 23:47:26 +00:00
2.21.0
2018-04-03 01:05:04 +00:00