lkml.org 
[lkml]   [2016]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 200/238] mmc: tegra: Disable UHS-I modes for tegra114
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jon Hunter <jonathanh@nvidia.com>

    commit 7bf037d6ac4768e228e337afd7b6c6d98f947f9f upstream.

    SD card support for Tegra114 started failing after commit a8e326a911d3
    ("mmc: tegra: implement module external clock change") was merged. This
    commit was part of a series to enable UHS-I modes for Tegra. To
    workaround this problem for now, disable UHS-I modes for Tegra114 by
    separating the soc data structures for Tegra114 and Tegra124 so that
    UHS-I is still enabled for Tegra124 but not Tegra114.

    Fixes: a8e326a911d3 ("mmc: tegra: implement module external clock change")
    Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
    Reviewed-by: Lucas Stach <dev@lynxeye.de>
    Acked-by: Thierry Reding <treding@nvidia.com>
    Acked-by: Adrian Hunter <adrian.hunter@intel.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mmc/host/sdhci-tegra.c | 12 +++++++++++-
    1 file changed, 11 insertions(+), 1 deletion(-)

    --- a/drivers/mmc/host/sdhci-tegra.c
    +++ b/drivers/mmc/host/sdhci-tegra.c
    @@ -147,10 +147,16 @@ static void tegra_sdhci_reset(struct sdh
    /* Advertise UHS modes as supported by host */
    if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR50)
    misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDR50;
    + else
    + misc_ctrl &= ~SDHCI_MISC_CTRL_ENABLE_SDR50;
    if (soc_data->nvquirks & NVQUIRK_ENABLE_DDR50)
    misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_DDR50;
    + else
    + misc_ctrl &= ~SDHCI_MISC_CTRL_ENABLE_DDR50;
    if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR104)
    misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDR104;
    + else
    + misc_ctrl &= ~SDHCI_MISC_CTRL_ENABLE_SDR104;
    sdhci_writel(host, misc_ctrl, SDHCI_TEGRA_VENDOR_MISC_CTRL);

    clk_ctrl = sdhci_readl(host, SDHCI_TEGRA_VENDOR_CLOCK_CTRL);
    @@ -335,6 +341,10 @@ static const struct sdhci_pltfm_data sdh

    static const struct sdhci_tegra_soc_data soc_data_tegra114 = {
    .pdata = &sdhci_tegra114_pdata,
    +};
    +
    +static const struct sdhci_tegra_soc_data soc_data_tegra124 = {
    + .pdata = &sdhci_tegra114_pdata,
    .nvquirks = NVQUIRK_ENABLE_SDR50 |
    NVQUIRK_ENABLE_DDR50 |
    NVQUIRK_ENABLE_SDR104,
    @@ -357,7 +367,7 @@ static const struct sdhci_tegra_soc_data

    static const struct of_device_id sdhci_tegra_dt_match[] = {
    { .compatible = "nvidia,tegra210-sdhci", .data = &soc_data_tegra210 },
    - { .compatible = "nvidia,tegra124-sdhci", .data = &soc_data_tegra114 },
    + { .compatible = "nvidia,tegra124-sdhci", .data = &soc_data_tegra124 },
    { .compatible = "nvidia,tegra114-sdhci", .data = &soc_data_tegra114 },
    { .compatible = "nvidia,tegra30-sdhci", .data = &soc_data_tegra30 },
    { .compatible = "nvidia,tegra20-sdhci", .data = &soc_data_tegra20 },

    \
     
     \ /
      Last update: 2016-04-10 22:21    [W:2.805 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site