| Message ID | 20191203200513.1758-5-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: renesas_sdhi: prepare for recent HS400 updates | expand |
On Tue, Dec 3, 2019 at 9:06 PM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > Now that the quirks structure is accesible, we can remove the TMIO flag > for HS400 using only 4 taps. This is Renesas specific anyhow. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
Hello! On 03.12.2019 23:05, Wolfram Sang wrote: > Now that the quirks structure is accesible, we can remove the TMIO flag Accessible? > for HS400 using only 4 taps. This is Renesas specific anyhow. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > drivers/mmc/host/renesas_sdhi_core.c | 8 +++----- > include/linux/mfd/tmio.h | 3 --- > 2 files changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c > index 2c743429e1e3..8ee6298d5a51 100644 > --- a/drivers/mmc/host/renesas_sdhi_core.c > +++ b/drivers/mmc/host/renesas_sdhi_core.c [...] > @@ -488,7 +488,8 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host) > static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host) > { > struct renesas_sdhi *priv = host_to_priv(host); > - bool use_4tap = host->pdata->flags & TMIO_MMC_HAVE_4TAP_HS400; > + bool use_4tap = priv->quirks && priv->quirks->hs400_4taps; > + Extra empty line? > > /* > * Skip checking SCC errors when running on 4 taps in HS400 mode as [...] MBR, Sergei
Hi Wolfram-san, > From: Wolfram Sang, Sent: Wednesday, December 4, 2019 5:05 AM > > Now that the quirks structure is accesible, we can remove the TMIO flag > for HS400 using only 4 taps. This is Renesas specific anyhow. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Thank you for the patch! After fixed minor things which Sergei-san mentioned, Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index 2c743429e1e3..8ee6298d5a51 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -350,7 +350,7 @@ static void renesas_sdhi_hs400_complete(struct tmio_mmc_host *host) 0x4 << SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_SHIFT); - if (host->pdata->flags & TMIO_MMC_HAVE_4TAP_HS400) + if (priv->quirks && priv->quirks->hs400_4taps) sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_TAPSET, host->tap_set / 2); @@ -488,7 +488,8 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host) static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host) { struct renesas_sdhi *priv = host_to_priv(host); - bool use_4tap = host->pdata->flags & TMIO_MMC_HAVE_4TAP_HS400; + bool use_4tap = priv->quirks && priv->quirks->hs400_4taps; + /* * Skip checking SCC errors when running on 4 taps in HS400 mode as @@ -720,9 +721,6 @@ int renesas_sdhi_probe(struct platform_device *pdev, if (quirks && quirks->hs400_disabled) host->mmc->caps2 &= ~(MMC_CAP2_HS400 | MMC_CAP2_HS400_ES); - if (quirks && quirks->hs400_4taps) - mmc_data->flags |= TMIO_MMC_HAVE_4TAP_HS400; - /* For some SoC, we disable internal WP. GPIO may override this */ if (mmc_can_gpio_ro(host->mmc)) mmc_data->capabilities2 &= ~MMC_CAP2_NO_WRITE_PROTECT; diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 739b7bf37eaa..8ba042430d8e 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -79,9 +79,6 @@ /* Some controllers have a CBSY bit */ #define TMIO_MMC_HAVE_CBSY BIT(11) -/* Some controllers that support HS400 use 4 taps while others use 8. */ -#define TMIO_MMC_HAVE_4TAP_HS400 BIT(13) - int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base); int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base); void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);
Now that the quirks structure is accesible, we can remove the TMIO flag for HS400 using only 4 taps. This is Renesas specific anyhow. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/mmc/host/renesas_sdhi_core.c | 8 +++----- include/linux/mfd/tmio.h | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-)