Commit d45f47a4 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'mmc-v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:

 - Override DLL_CONFIG only with valid values in sdhci-msm

 - Get rid of of_match_ptr() macro to fix warning in owl-mmc

 - Limit segments to 1 to fix meson-gx G12A/G12B SoCs

* tag 'mmc-v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-msm: Override DLL_CONFIG only if the valid value is supplied
  mmc: owl-mmc: Get rid of of_match_ptr() macro
  mmc: meson-gx: limit segments to 1 when dram-access-quirk is needed
parents 42f82040 3ec2d511
...@@ -1146,9 +1146,11 @@ static int meson_mmc_probe(struct platform_device *pdev) ...@@ -1146,9 +1146,11 @@ static int meson_mmc_probe(struct platform_device *pdev)
mmc->caps |= MMC_CAP_CMD23; mmc->caps |= MMC_CAP_CMD23;
if (host->dram_access_quirk) { if (host->dram_access_quirk) {
/* Limit segments to 1 due to low available sram memory */
mmc->max_segs = 1;
/* Limit to the available sram memory */ /* Limit to the available sram memory */
mmc->max_segs = SD_EMMC_SRAM_DATA_BUF_LEN / mmc->max_blk_size; mmc->max_blk_count = SD_EMMC_SRAM_DATA_BUF_LEN /
mmc->max_blk_count = mmc->max_segs; mmc->max_blk_size;
} else { } else {
mmc->max_blk_count = CMD_CFG_LENGTH_MASK; mmc->max_blk_count = CMD_CFG_LENGTH_MASK;
mmc->max_segs = SD_EMMC_DESC_BUF_LEN / mmc->max_segs = SD_EMMC_DESC_BUF_LEN /
......
...@@ -689,7 +689,7 @@ MODULE_DEVICE_TABLE(of, owl_mmc_of_match); ...@@ -689,7 +689,7 @@ MODULE_DEVICE_TABLE(of, owl_mmc_of_match);
static struct platform_driver owl_mmc_driver = { static struct platform_driver owl_mmc_driver = {
.driver = { .driver = {
.name = "owl_mmc", .name = "owl_mmc",
.of_match_table = of_match_ptr(owl_mmc_of_match), .of_match_table = owl_mmc_of_match,
}, },
.probe = owl_mmc_probe, .probe = owl_mmc_probe,
.remove = owl_mmc_remove, .remove = owl_mmc_remove,
......
...@@ -618,8 +618,9 @@ static int msm_init_cm_dll(struct sdhci_host *host) ...@@ -618,8 +618,9 @@ static int msm_init_cm_dll(struct sdhci_host *host)
config &= ~CORE_CLK_PWRSAVE; config &= ~CORE_CLK_PWRSAVE;
writel_relaxed(config, host->ioaddr + msm_offset->core_vendor_spec); writel_relaxed(config, host->ioaddr + msm_offset->core_vendor_spec);
config = msm_host->dll_config; if (msm_host->dll_config)
writel_relaxed(config, host->ioaddr + msm_offset->core_dll_config); writel_relaxed(msm_host->dll_config,
host->ioaddr + msm_offset->core_dll_config);
if (msm_host->use_14lpp_dll_reset) { if (msm_host->use_14lpp_dll_reset) {
config = readl_relaxed(host->ioaddr + config = readl_relaxed(host->ioaddr +
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment