| Message ID | 1421832726-21656-3-git-send-email-gregory.clement@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Gregory, 2015-01-21 10:32 GMT+01:00 Gregory CLEMENT <gregory.clement@free-electrons.com>: > According to erratum 'ERR-7878951' Armada 38x SDHCI controller has > different capabilities than the ones shown in its registers: > > - it doesn't support the voltage switching: it can work either with > 3.3V or 1.8V supply > - it doesn't support the SDR104 mode > - SDR50 mode doesn't need tuning > > The SDHCI_QUIRK_MISSING_CAPS quirk is used for updating the > capabilities accordingly. > > Fixes: 5491ce3f79ee ("mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller") > Cc: <stable@vger.kernel.org> # v3.15+ > > Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > --- > drivers/mmc/host/sdhci-pxav3.c | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > index 7b07325b4fba..4daa47a53a62 100644 > --- a/drivers/mmc/host/sdhci-pxav3.c > +++ b/drivers/mmc/host/sdhci-pxav3.c > @@ -118,8 +118,11 @@ static int mv_conf_mbus_windows(struct platform_device *pdev, > return 0; > } > > -static int armada_38x_quirks(struct sdhci_host *host) > +static int armada_38x_quirks(struct platform_device *pdev, > + struct sdhci_host *host) > { > + struct device_node *np = pdev->dev.of_node; > + > host->quirks |= SDHCI_QUIRK_MISSING_CAPS; > /* > * According to erratum 'FE-2946959' both SDR50 and DDR50 > @@ -129,6 +132,20 @@ static int armada_38x_quirks(struct sdhci_host *host) > */ > host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); > host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_DDR50); > + > + /* > + * According to erratum 'ERR-7878951' Armada 38x SDHCI > + * controller has different capabilities than the ones shown > + * in its registers > + */ > + host->caps = sdhci_readl(host, SDHCI_CAPABILITIES); > + if (of_get_property(np, "no-1-8-v", NULL)) { > + host->caps &= ~SDHCI_CAN_VDD_180; > + host->mmc->caps &= ~MMC_CAP_1_8V_DDR; > + } else > + host->caps &= ~SDHCI_CAN_VDD_330; > + host->caps1 &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_USE_SDR50_TUNING); > + > return 0; > } > > @@ -333,7 +350,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) > clk_prepare_enable(pxa->clk_core); > > if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) { > - ret = armada_38x_quirks(host); > + ret = armada_38x_quirks(pdev, host); > if (ret < 0) > goto err_quirks; > ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info()); > -- Right here there are lines: /* enable 1/8V DDR capable */ host->mmc->caps |= MMC_CAP_1_8V_DDR; Which make a possible opposite change from armada_38x_quirks cacelled. Best regards, Marcin -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Marcin, On 21/01/2015 15:52, Marcin Wojtas wrote: > Hi Gregory, > > 2015-01-21 10:32 GMT+01:00 Gregory CLEMENT <gregory.clement@free-electrons.com>: >> According to erratum 'ERR-7878951' Armada 38x SDHCI controller has >> different capabilities than the ones shown in its registers: >> >> - it doesn't support the voltage switching: it can work either with >> 3.3V or 1.8V supply >> - it doesn't support the SDR104 mode >> - SDR50 mode doesn't need tuning >> >> The SDHCI_QUIRK_MISSING_CAPS quirk is used for updating the >> capabilities accordingly. >> >> Fixes: 5491ce3f79ee ("mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller") >> Cc: <stable@vger.kernel.org> # v3.15+ >> >> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> >> --- >> drivers/mmc/host/sdhci-pxav3.c | 21 +++++++++++++++++++-- >> 1 file changed, 19 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c >> index 7b07325b4fba..4daa47a53a62 100644 >> --- a/drivers/mmc/host/sdhci-pxav3.c >> +++ b/drivers/mmc/host/sdhci-pxav3.c >> @@ -118,8 +118,11 @@ static int mv_conf_mbus_windows(struct platform_device *pdev, >> return 0; >> } >> >> -static int armada_38x_quirks(struct sdhci_host *host) >> +static int armada_38x_quirks(struct platform_device *pdev, >> + struct sdhci_host *host) >> { >> + struct device_node *np = pdev->dev.of_node; >> + >> host->quirks |= SDHCI_QUIRK_MISSING_CAPS; >> /* >> * According to erratum 'FE-2946959' both SDR50 and DDR50 >> @@ -129,6 +132,20 @@ static int armada_38x_quirks(struct sdhci_host *host) >> */ >> host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); >> host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_DDR50); >> + >> + /* >> + * According to erratum 'ERR-7878951' Armada 38x SDHCI >> + * controller has different capabilities than the ones shown >> + * in its registers >> + */ >> + host->caps = sdhci_readl(host, SDHCI_CAPABILITIES); >> + if (of_get_property(np, "no-1-8-v", NULL)) { >> + host->caps &= ~SDHCI_CAN_VDD_180; >> + host->mmc->caps &= ~MMC_CAP_1_8V_DDR; >> + } else >> + host->caps &= ~SDHCI_CAN_VDD_330; >> + host->caps1 &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_USE_SDR50_TUNING); >> + >> return 0; >> } >> >> @@ -333,7 +350,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) >> clk_prepare_enable(pxa->clk_core); >> >> if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) { >> - ret = armada_38x_quirks(host); >> + ret = armada_38x_quirks(pdev, host); >> if (ret < 0) >> goto err_quirks; >> ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info()); >> -- > > Right here there are lines: > /* enable 1/8V DDR capable */ > host->mmc->caps |= MMC_CAP_1_8V_DDR; > > Which make a possible opposite change from armada_38x_quirks cacelled. Good catch! I will remove it in the v2. Thanks, Gregory
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 7b07325b4fba..4daa47a53a62 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -118,8 +118,11 @@ static int mv_conf_mbus_windows(struct platform_device *pdev, return 0; } -static int armada_38x_quirks(struct sdhci_host *host) +static int armada_38x_quirks(struct platform_device *pdev, + struct sdhci_host *host) { + struct device_node *np = pdev->dev.of_node; + host->quirks |= SDHCI_QUIRK_MISSING_CAPS; /* * According to erratum 'FE-2946959' both SDR50 and DDR50 @@ -129,6 +132,20 @@ static int armada_38x_quirks(struct sdhci_host *host) */ host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_DDR50); + + /* + * According to erratum 'ERR-7878951' Armada 38x SDHCI + * controller has different capabilities than the ones shown + * in its registers + */ + host->caps = sdhci_readl(host, SDHCI_CAPABILITIES); + if (of_get_property(np, "no-1-8-v", NULL)) { + host->caps &= ~SDHCI_CAN_VDD_180; + host->mmc->caps &= ~MMC_CAP_1_8V_DDR; + } else + host->caps &= ~SDHCI_CAN_VDD_330; + host->caps1 &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_USE_SDR50_TUNING); + return 0; } @@ -333,7 +350,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) clk_prepare_enable(pxa->clk_core); if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) { - ret = armada_38x_quirks(host); + ret = armada_38x_quirks(pdev, host); if (ret < 0) goto err_quirks; ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());
According to erratum 'ERR-7878951' Armada 38x SDHCI controller has different capabilities than the ones shown in its registers: - it doesn't support the voltage switching: it can work either with 3.3V or 1.8V supply - it doesn't support the SDR104 mode - SDR50 mode doesn't need tuning The SDHCI_QUIRK_MISSING_CAPS quirk is used for updating the capabilities accordingly. Fixes: 5491ce3f79ee ("mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller") Cc: <stable@vger.kernel.org> # v3.15+ Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> --- drivers/mmc/host/sdhci-pxav3.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)