From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: Re: [PATCH] mmc: tegra: Disable UHS-I modes for tegra114 Date: Fri, 26 Feb 2016 18:47:24 +0100 Message-ID: <1456508844.28237.1.camel@lynxeye.de> References: <1455806924-14967-1-git-send-email-jonathanh@nvidia.com> <1456479257-12147-1-git-send-email-jonathanh@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1456479257-12147-1-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Jon Hunter , Ulf Hansson , Adrian Hunter , Stephen Warren , Thierry Reding , Alexandre Courbot Cc: linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org Am Freitag, den 26.02.2016, 09:34 +0000 schrieb Jon Hunter: > 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. >=20 > Fixes: a8e326a911d3 ("mmc: tegra: implement module external clock > change") >=20 > Signed-off-by: Jon Hunter This looks good to me now, Reviewed-by: Lucas Stach > --- > =C2=A0drivers/mmc/host/sdhci-tegra.c | 12 +++++++++++- > =C2=A01 file changed, 11 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci- > tegra.c > index 83c4bf7bc16c..212d51f08939 100644 > --- a/drivers/mmc/host/sdhci-tegra.c > +++ b/drivers/mmc/host/sdhci-tegra.c > @@ -147,10 +147,16 @@ static void tegra_sdhci_reset(struct sdhci_host > *host, u8 mask) > =C2=A0 /* Advertise UHS modes as supported by host */ > =C2=A0 if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR50) > =C2=A0 misc_ctrl |=3D SDHCI_MISC_CTRL_ENABLE_SDR50; > + else > + misc_ctrl &=3D ~SDHCI_MISC_CTRL_ENABLE_SDR50; > =C2=A0 if (soc_data->nvquirks & NVQUIRK_ENABLE_DDR50) > =C2=A0 misc_ctrl |=3D SDHCI_MISC_CTRL_ENABLE_DDR50; > + else > + misc_ctrl &=3D ~SDHCI_MISC_CTRL_ENABLE_DDR50; > =C2=A0 if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR104) > =C2=A0 misc_ctrl |=3D SDHCI_MISC_CTRL_ENABLE_SDR104; > + else > + misc_ctrl &=3D ~SDHCI_MISC_CTRL_ENABLE_SDR104; > =C2=A0 sdhci_writel(host, misc_ctrl, SDHCI_TEGRA_VENDOR_MISC_CTRL); > =C2=A0 > =C2=A0 clk_ctrl =3D sdhci_readl(host, SDHCI_TEGRA_VENDOR_CLOCK_CTRL); > @@ -335,6 +341,10 @@ static const struct sdhci_pltfm_data > sdhci_tegra114_pdata =3D { > =C2=A0 > =C2=A0static const struct sdhci_tegra_soc_data soc_data_tegra114 =3D = { > =C2=A0 .pdata =3D &sdhci_tegra114_pdata, > +}; > + > +static const struct sdhci_tegra_soc_data soc_data_tegra124 =3D { > + .pdata =3D &sdhci_tegra114_pdata, > =C2=A0 .nvquirks =3D NVQUIRK_ENABLE_SDR50 | > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0NVQUIRK_ENABLE_DDR50 | > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0NVQUIRK_ENABLE_SDR104, > @@ -357,7 +367,7 @@ static const struct sdhci_tegra_soc_data > soc_data_tegra210 =3D { > =C2=A0 > =C2=A0static const struct of_device_id sdhci_tegra_dt_match[] =3D { > =C2=A0 { .compatible =3D "nvidia,tegra210-sdhci", .data =3D > &soc_data_tegra210 }, > - { .compatible =3D "nvidia,tegra124-sdhci", .data =3D > &soc_data_tegra114 }, > + { .compatible =3D "nvidia,tegra124-sdhci", .data =3D > &soc_data_tegra124 }, > =C2=A0 { .compatible =3D "nvidia,tegra114-sdhci", .data =3D > &soc_data_tegra114 }, > =C2=A0 { .compatible =3D "nvidia,tegra30-sdhci", .data =3D > &soc_data_tegra30 }, > =C2=A0 { .compatible =3D "nvidia,tegra20-sdhci", .data =3D > &soc_data_tegra20 },