Merge branch 'fixes' into next (1208e751) · Commits · 戴 / test

drivers/mmc/host/mtk-sd.c

+26 −7

Original line number	Diff line number	Diff line
		@@ -463,7 +463,7 @@ struct msdc_host {

		static const struct mtk_mmc_compatible mt8135_compat = {
		.clk_div_bits = 8,
		.recheck_sdio_irq = false,
		.recheck_sdio_irq = true,
		.hs400_tune = false,
		.pad_tune_reg = MSDC_PAD_TUNE,
		.async_fifo = false,
		@@ -502,7 +502,7 @@ static const struct mtk_mmc_compatible mt8183_compat = {

		static const struct mtk_mmc_compatible mt2701_compat = {
		.clk_div_bits = 12,
		.recheck_sdio_irq = false,
		.recheck_sdio_irq = true,
		.hs400_tune = false,
		.pad_tune_reg = MSDC_PAD_TUNE0,
		.async_fifo = true,
		@@ -528,7 +528,7 @@ static const struct mtk_mmc_compatible mt2712_compat = {

		static const struct mtk_mmc_compatible mt7622_compat = {
		.clk_div_bits = 12,
		.recheck_sdio_irq = false,
		.recheck_sdio_irq = true,
		.hs400_tune = false,
		.pad_tune_reg = MSDC_PAD_TUNE0,
		.async_fifo = true,
		@@ -541,7 +541,7 @@ static const struct mtk_mmc_compatible mt7622_compat = {

		static const struct mtk_mmc_compatible mt8516_compat = {
		.clk_div_bits = 12,
		.recheck_sdio_irq = false,
		.recheck_sdio_irq = true,
		.hs400_tune = false,
		.pad_tune_reg = MSDC_PAD_TUNE0,
		.async_fifo = true,
		@@ -552,7 +552,7 @@ static const struct mtk_mmc_compatible mt8516_compat = {

		static const struct mtk_mmc_compatible mt7620_compat = {
		.clk_div_bits = 8,
		.recheck_sdio_irq = false,
		.recheck_sdio_irq = true,
		.hs400_tune = false,
		.pad_tune_reg = MSDC_PAD_TUNE,
		.async_fifo = false,
		@@ -565,6 +565,7 @@ static const struct mtk_mmc_compatible mt7620_compat = {

		static const struct mtk_mmc_compatible mt6779_compat = {
		.clk_div_bits = 12,
		.recheck_sdio_irq = false,
		.hs400_tune = false,
		.pad_tune_reg = MSDC_PAD_TUNE0,
		.async_fifo = true,
		@@ -2760,11 +2761,29 @@ static int msdc_runtime_resume(struct device *dev)
		msdc_restore_reg(host);
		return 0;
		}

		static int msdc_suspend(struct device *dev)
		{
		struct mmc_host *mmc = dev_get_drvdata(dev);
		int ret;

		if (mmc->caps2 & MMC_CAP2_CQE) {
		ret = cqhci_suspend(mmc);
		if (ret)
		return ret;
		}

		return pm_runtime_force_suspend(dev);
		}

		static int msdc_resume(struct device *dev)
		{
		return pm_runtime_force_resume(dev);
		}
		#endif

		static const struct dev_pm_ops msdc_dev_pm_ops = {
		SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
		pm_runtime_force_resume)
		SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume)
		SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, NULL)
		};

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1186,16 +1186,19 @@ static struct sdhci_arasan_of_data sdhci_arasan_versal_data = {
		static struct sdhci_arasan_of_data intel_keembay_emmc_data = {
		.soc_ctl_map = &intel_keembay_soc_ctl_map,
		.pdata = &sdhci_keembay_emmc_pdata,
		.clk_ops = &arasan_clk_ops,
		};

		static struct sdhci_arasan_of_data intel_keembay_sd_data = {
		.soc_ctl_map = &intel_keembay_soc_ctl_map,
		.pdata = &sdhci_keembay_sd_pdata,
		.clk_ops = &arasan_clk_ops,
		};

		static struct sdhci_arasan_of_data intel_keembay_sdio_data = {
		.soc_ctl_map = &intel_keembay_soc_ctl_map,
		.pdata = &sdhci_keembay_sdio_pdata,
		.clk_ops = &arasan_clk_ops,
		};

		static const struct of_device_id sdhci_arasan_of_match[] = {

Admin message