Commit eb68ba4a authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.15-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.16.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 9e654f2b 08f95975

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,