OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MMC host: 

- sdhci-msm: Override DLL_CONFIG only with valid values
  - owl-mmc: Get rid of of_match_ptr() macro to fix warning
  - meson-gx: Limit segments to 1 to fix G12A/G12B SoCs
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAl8IHXkXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCnSChAAwTzshIykZOc9sPY7wQYvZ+R1
 +JySDdc7HbTCcN3faV0drJV4HJgQvqgNWR8mIAM97WgizODZO5MPfROwj+0/MQuw
 JK+jOXwnEJyzlioUBvNs5xIPnZi+QBshPpzSD+J6qZPA5UP1RoY9HNNlZ1aJQaDm
 goYMBemhukfKDqDenbTvyuU6bSLrO7OSO+LX3mXi1JDFv/+XodLnSo17Mgmbrkti
 Et3SU4RXHBv06EkVzk7A4RIKqmQGc86Jc9mrOVZ/OVyIJznn7tD4RQBEaU9jpwrV
 0cOuNgXa1Go+6NEGZ5XQn6/d6kHSc1jkFCfd2hytSTq3vOtHyuZML4SlZl+qATCS
 osYzDrovkkMzIWM4lj3vHFM1fRHwBV0Wxngve5SF8oPxlW5ZlKDTeZQ3ltwYpPLw
 Uo/nNGeC8PXoEi+s96YY0wTTgLAEsNyymgrge1Tz1UNiDVpcgJCfg05RTjQWG0ss
 dkYIeCU5OxKd/EzfUStBSaMxYUCc9ee+394/wY6WM7x3AiBngmQBvQBuv+xI2+9j
 lkjzcK4/6KRu3EJSDb86q0IEKqy3gwOooOhlJbz7a1b7D+QGqT5yNlwq+Vkjk0U2
 G+PIyTRV3sKCRpZq2NnnE4LSaWSuawRGWMiizqXYmW08e3Wg2VGtTUCn9HO6r+uo
 Ao6uFFMU/AAQwsdRsfQ=
 =Qaok
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2020-07-10 08:28:49 -07:00
parent 42f82040ee 3ec2d5113e
commit d45f47a468
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/host/meson-gx-mmc.c
View File

@ -1146,9 +1146,11 @@ static int meson_mmc_probe(struct platform_device *pdev)
mmc->caps |= MMC_CAP_CMD23;
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 */
mmc->max_segs = SD_EMMC_SRAM_DATA_BUF_LEN / mmc->max_blk_size;
mmc->max_blk_count = mmc->max_segs;
mmc->max_blk_count = SD_EMMC_SRAM_DATA_BUF_LEN /
mmc->max_blk_size;
} else {
mmc->max_blk_count = CMD_CFG_LENGTH_MASK;
mmc->max_segs = SD_EMMC_DESC_BUF_LEN /

2
drivers/mmc/host/owl-mmc.c
View File

@ -689,7 +689,7 @@ MODULE_DEVICE_TABLE(of, owl_mmc_of_match);
static struct platform_driver owl_mmc_driver = {
.driver = {
.name = "owl_mmc",
.of_match_table = of_match_ptr(owl_mmc_of_match),
.of_match_table = owl_mmc_of_match,
},
.probe = owl_mmc_probe,
.remove = owl_mmc_remove,

5
drivers/mmc/host/sdhci-msm.c
View File

@ -618,8 +618,9 @@ static int msm_init_cm_dll(struct sdhci_host *host)
config &= ~CORE_CLK_PWRSAVE;
writel_relaxed(config, host->ioaddr + msm_offset->core_vendor_spec);
config = msm_host->dll_config;
writel_relaxed(config, host->ioaddr + msm_offset->core_dll_config);
if (msm_host->dll_config)
writel_relaxed(msm_host->dll_config,
host->ioaddr + msm_offset->core_dll_config);
if (msm_host->use_14lpp_dll_reset) {
config = readl_relaxed(host->ioaddr +