A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "mmc: host: sdhci-msm: Don't clear IO_PAD_PWR_SWITCH when faking 3V support"

Browse source
This commit is contained in:
qctecmdr 2021-02-01 13:34:04 -08:00 • committed by Gerrit - the friendly Code Review server
commit 503b958af6
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/mmc/host/sdhci-msm.c
View file

@ -443,7 +443,7 @@ struct sdhci_msm_host {
struct delayed_work bus_vote_work;
struct delayed_work clk_gating_work;
bool pltfm_init_done;
bool core_3_0v_support;
bool fake_core_3_0v_support;
bool use_7nm_dll;
struct sdhci_msm_dll_hsr *dll_hsr;
struct sdhci_msm_regs_restore regs_restore;
@ -1822,7 +1822,7 @@ static bool sdhci_msm_populate_pdata(struct device *dev,
}
if (of_get_property(np, "qcom,core_3_0v_support", NULL))
msm_host->core_3_0v_support = true;
msm_host->fake_core_3_0v_support = true;
msm_host->regs_restore.is_supported =
of_property_read_bool(np, "qcom,restore-after-cx-collapse");
@ -2388,7 +2388,8 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq)
new_config = config;
if ((io_level & REQ_IO_HIGH) &&
(msm_host->caps_0 & CORE_3_0V_SUPPORT))
(msm_host->caps_0 & CORE_3_0V_SUPPORT) &&
!msm_host->fake_core_3_0v_support)
new_config &= ~CORE_IO_PAD_PWR_SWITCH;
else if ((io_level & REQ_IO_LOW) ||
(msm_host->caps_0 & CORE_1_8V_SUPPORT))
@ -3523,7 +3524,7 @@ static void sdhci_set_default_hw_caps(struct sdhci_msm_host *msm_host,
msm_host->use_14lpp_dll_reset = true;
/* Fake 3.0V support for SDIO devices which requires such voltage */
if (msm_host->core_3_0v_support) {
if (msm_host->fake_core_3_0v_support) {
caps |= CORE_3_0V_SUPPORT;
writel_relaxed((readl_relaxed(host->ioaddr +
SDHCI_CAPABILITIES) | caps), host->ioaddr +