From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zach Brown Subject: [RFC v2 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: Fri, 21 Oct 2016 16:35:15 -0500 Message-ID: <1477085715-30213-3-git-send-email-zach.brown@ni.com> References: <1477085715-30213-1-git-send-email-zach.brown@ni.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1477085715-30213-1-git-send-email-zach.brown@ni.com> Sender: linux-mmc-owner@vger.kernel.org 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 List-Id: devicetree@vger.kernel.org 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. Signed-off-by: Zach Brown --- drivers/mmc/host/sdhci.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 1e25b01..59c62d3 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -3013,10 +3014,19 @@ void __sdhci_read_caps(struct sdhci_host *host, u16 *ver, u32 *caps, u32 *caps1) host->caps = caps ? *caps : sdhci_readl(host, SDHCI_CAPABILITIES); + if (of_property_read_bool(mmc_dev(host->mmc)->of_node, + "sdhci-cap-speed-modes-broken")) + host->caps &= ~SDHCI_CAN_DO_HISPD; + if (host->version < SDHCI_SPEC_300) return; host->caps1 = caps1 ? *caps1 : sdhci_readl(host, SDHCI_CAPABILITIES_1); + + if (of_property_read_bool(mmc_dev(host->mmc)->of_node, + "sdhci-cap-speed-modes-broken")) + host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 | + SDHCI_SUPPORT_DDR50 | SDHCI_SUPPORT_HS400); } EXPORT_SYMBOL_GPL(__sdhci_read_caps); -- 2.7.4