From: Zach Brown <zach.brown@ni.com>
To: ulf.hansson@linaro.org
Cc: adrian.hunter@intel.com, robh+dt@kernel.org,
mark.rutland@arm.com, linux-mmc@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
zach.brown@ni.com
Subject: [RFC 2/2] mmc: sdhci: Ignore capability register when it comes to speeds and use DT binding instead when sdhci-cap-speed-modes-broken is set.
Date: Tue, 18 Oct 2016 16:05:36 -0500 [thread overview]
Message-ID: <1476824736-9337-3-git-send-email-zach.brown@ni.com> (raw)
In-Reply-To: <1476824736-9337-1-git-send-email-zach.brown@ni.com>
When the sdhci-cap-speed-modes-broken DT property is set, the driver
will ignore the bits of the capability registers that correspond to
speed modes and will read the of properties of the device to determine
which speeds are supported.
Signed-off-by: Zach Brown <zach.brown@ni.com>
---
drivers/mmc/host/sdhci.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 1e25b01..100649a 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -22,6 +22,7 @@
#include <linux/scatterlist.h>
#include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h>
+#include <linux/of.h>
#include <linux/leds.h>
@@ -3020,6 +3021,32 @@ void __sdhci_read_caps(struct sdhci_host *host, u16 *ver, u32 *caps, u32 *caps1)
}
EXPORT_SYMBOL_GPL(__sdhci_read_caps);
+void sdhci_get_speed_caps_from_of(struct sdhci_host *host)
+{
+ struct mmc_host *mmc = host->mmc;
+
+ host->caps &= ~SDHCI_CAN_DO_HISPD;
+
+ if (of_property_read_bool(mmc_dev(mmc)->of_node, "cap-sd-highspeed"))
+ host->caps |= SDHCI_CAN_DO_HISPD;
+
+ if (host->version < SDHCI_SPEC_300)
+ return;
+
+ host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |
+ SDHCI_SUPPORT_DDR50);
+
+ if (of_property_read_bool(mmc_dev(mmc)->of_node, "sd-uhs-sdr50"))
+ host->caps1 |= SDHCI_SUPPORT_SDR50;
+
+ if (of_property_read_bool(mmc_dev(mmc)->of_node, "sd-uhs-sdr104"))
+ host->caps1 |= SDHCI_SUPPORT_SDR104;
+
+ if (of_property_read_bool(mmc_dev(mmc)->of_node, "sd-uhs-ddr50"))
+ host->caps1 |= SDHCI_SUPPORT_DDR50;
+
+}
+
int sdhci_setup_host(struct sdhci_host *host)
{
struct mmc_host *mmc;
@@ -3046,6 +3073,10 @@ int sdhci_setup_host(struct sdhci_host *host)
return ret;
sdhci_read_caps(host);
+ if (of_property_read_bool(mmc_dev(mmc)->of_node,
+ "sdhci-cap-speed-modes-broken"))
+ sdhci_get_speed_caps_from_of(host);
+
override_timeout_clk = host->timeout_clk;
--
2.7.4
next prev parent reply other threads:[~2016-10-18 21:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-18 21:05 [RFC 0/2] Ignore capability registers when it comes to speeds and use DT binding instead Zach Brown
[not found] ` <1476824736-9337-1-git-send-email-zach.brown-acOepvfBmUk@public.gmane.org>
2016-10-18 21:05 ` [RFC 1/2] mmc: sdhci: dt: Add device tree property sdhci-cap-speed-modes-broken Zach Brown
2016-10-26 21:03 ` Rob Herring
2016-10-18 21:05 ` Zach Brown [this message]
[not found] ` <1476824736-9337-3-git-send-email-zach.brown-acOepvfBmUk@public.gmane.org>
2016-10-19 7:10 ` [RFC 2/2] mmc: sdhci: Ignore capability register when it comes to speeds and use DT binding instead when sdhci-cap-speed-modes-broken is set Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476824736-9337-3-git-send-email-zach.brown@ni.com \
--to=zach.brown@ni.com \
--cc=adrian.hunter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).