Commit a5b2c67a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC host fixes from Ulf Hansson:

 - sdhci_am654: Fix MMC init failures on am62x boards

 - sdhci-of-dwcmshc: Add PD workaround on RK3576 to avoid hang

* tag 'mmc-v6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci_am654: Add SDHCI_QUIRK2_SUPPRESS_V1P8_ENA quirk to am62 compatible
  mmc: sdhci-of-dwcmshc: add PD workaround on RK3576
parents a11a7222 71c9475b

drivers/mmc/host/sdhci-of-dwcmshc.c

+40 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/pm_domain.h>

#include <linux/pm_runtime.h>

#include <linux/reset.h>

#include <linux/sizes.h>
@@ -745,6 +746,29 @@ static void dwcmshc_rk35xx_postinit(struct sdhci_host *host, struct dwcmshc_priv 
	}

}



static void dwcmshc_rk3576_postinit(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv)

{

	struct device *dev = mmc_dev(host->mmc);

	int ret;



	/*

	 * This works around the design of the RK3576's power domains, which

	 * makes the PD_NVM power domain, which the sdhci controller on the

	 * RK3576 is in, never come back the same way once it's run-time

	 * suspended once. This can happen during early kernel boot if no driver

	 * is using either PD_NVM or its child power domain PD_SDGMAC for a

	 * short moment, leading to it being turned off to save power. By

	 * keeping it on, sdhci suspending won't lead to PD_NVM becoming a

	 * candidate for getting turned off.

	 */

	ret = dev_pm_genpd_rpm_always_on(dev, true);

	if (ret && ret != -EOPNOTSUPP)

		dev_warn(dev, "failed to set PD rpm always on, SoC may hang later: %pe\n",

			 ERR_PTR(ret));



	dwcmshc_rk35xx_postinit(host, dwc_priv);

}



static int th1520_execute_tuning(struct sdhci_host *host, u32 opcode)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -1176,6 +1200,18 @@ static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { 
	.postinit = dwcmshc_rk35xx_postinit,

};



static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rk3576_pdata = {

	.pdata = {

		.ops = &sdhci_dwcmshc_rk35xx_ops,

		.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |

			  SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,

		.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |

			   SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN,

	},

	.init = dwcmshc_rk35xx_init,

	.postinit = dwcmshc_rk3576_postinit,

};



static const struct dwcmshc_pltfm_data sdhci_dwcmshc_th1520_pdata = {

	.pdata = {

		.ops = &sdhci_dwcmshc_th1520_ops,
@@ -1274,6 +1310,10 @@ static const struct of_device_id sdhci_dwcmshc_dt_ids[] = { 
		.compatible = "rockchip,rk3588-dwcmshc",

		.data = &sdhci_dwcmshc_rk35xx_pdata,

	},

	{

		.compatible = "rockchip,rk3576-dwcmshc",

		.data = &sdhci_dwcmshc_rk3576_pdata,

	},

	{

		.compatible = "rockchip,rk3568-dwcmshc",

		.data = &sdhci_dwcmshc_rk35xx_pdata,

drivers/mmc/host/sdhci_am654.c

+34 −1
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ struct sdhci_am654_data { 
	u32 tuning_loop;



#define SDHCI_AM654_QUIRK_FORCE_CDTEST BIT(0)

#define SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA BIT(1)

};



struct window {
@@ -166,6 +167,7 @@ struct window { 
struct sdhci_am654_driver_data {

	const struct sdhci_pltfm_data *pdata;

	u32 flags;

	u32 quirks;

#define IOMUX_PRESENT	(1 << 0)

#define FREQSEL_2_BIT	(1 << 1)

#define STRBSEL_4_BIT	(1 << 2)
@@ -356,6 +358,29 @@ static void sdhci_j721e_4bit_set_clock(struct sdhci_host *host, 
	sdhci_set_clock(host, clock);

}



static int sdhci_am654_start_signal_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)

{

	struct sdhci_host *host = mmc_priv(mmc);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_am654_data *sdhci_am654 = sdhci_pltfm_priv(pltfm_host);

	int ret;



	if ((sdhci_am654->quirks & SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA) &&

	    ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) {

		if (!IS_ERR(mmc->supply.vqmmc)) {

			ret = mmc_regulator_set_vqmmc(mmc, ios);

			if (ret < 0) {

				pr_err("%s: Switching to 1.8V signalling voltage failed,\n",

				       mmc_hostname(mmc));

				return -EIO;

			}

		}

		return 0;

	}



	return sdhci_start_signal_voltage_switch(mmc, ios);

}



static u8 sdhci_am654_write_power_on(struct sdhci_host *host, u8 val, int reg)

{

	writeb(val, host->ioaddr + reg);
@@ -650,6 +675,12 @@ static const struct sdhci_am654_driver_data sdhci_j721e_4bit_drvdata = { 
	.flags = IOMUX_PRESENT,

};



static const struct sdhci_am654_driver_data sdhci_am62_4bit_drvdata = {

	.pdata = &sdhci_j721e_4bit_pdata,

	.flags = IOMUX_PRESENT,

	.quirks = SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA,

};



static const struct soc_device_attribute sdhci_am654_devices[] = {

	{ .family = "AM65X",

	  .revision = "SR1.0",
@@ -872,7 +903,7 @@ static const struct of_device_id sdhci_am654_of_match[] = { 
	},

	{

		.compatible = "ti,am62-sdhci",

		.data = &sdhci_j721e_4bit_drvdata,

		.data = &sdhci_am62_4bit_drvdata,

	},

	{ /* sentinel */ }

};
@@ -906,6 +937,7 @@ static int sdhci_am654_probe(struct platform_device *pdev) 
	pltfm_host = sdhci_priv(host);

	sdhci_am654 = sdhci_pltfm_priv(pltfm_host);

	sdhci_am654->flags = drvdata->flags;

	sdhci_am654->quirks = drvdata->quirks;



	clk_xin = devm_clk_get(dev, "clk_xin");

	if (IS_ERR(clk_xin)) {
@@ -940,6 +972,7 @@ static int sdhci_am654_probe(struct platform_device *pdev) 
		goto err_pltfm_free;

	}



	host->mmc_host_ops.start_signal_voltage_switch = sdhci_am654_start_signal_voltage_switch;

	host->mmc_host_ops.execute_tuning = sdhci_am654_execute_tuning;



	pm_runtime_get_noresume(dev);