android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "mmc: sdhci-msm: Add support for multicard tray removal FR"

Browse Source
This commit is contained in:
qctecmdr 2023-03-20 08:40:29 -07:00 committed by Gerrit - the friendly Code Review server
commit 5eaef642ce
2 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
* drivers/mmc/host/sdhci-msm.c - Qualcomm SDHCI Platform driver
*
* Copyright (c) 2013-2014,2020-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/module.h>
@ -1558,6 +1558,25 @@ static int sdhci_msm_dt_parse_vreg_info(struct device *dev,
vreg->msm_host = msm_host;
vreg->name = vreg_name;
/*
* To support FR84471 for chipsets where PMIC doesn't support
* PBS ram sequence to turn OFF regulators automatically on
* multicard tray removal, parse and use new regulator resources
* which are exposed by PMIC team for enabling/disabling
* conditions only and its old design for voltage/load.
*/
if (mmc_card_is_removable(host->mmc) &&
!vreg->multi_card_tray_wa_needed) {
snprintf(prop_name, MAX_PROP_SIZE, "%s-en-dis", vreg_name);
strlcpy(vreg->en_dis_name, prop_name, sizeof(vreg->en_dis_name));
snprintf(prop_name, MAX_PROP_SIZE, "%s-supply", vreg->en_dis_name);
if (of_parse_phandle(np, prop_name, 0)) {
dev_info(dev, "Multi card tray WA needed\n");
vreg->multi_card_tray_wa_needed = true;
}
}
snprintf(prop_name, MAX_PROP_SIZE,
"qcom,%s-always-on", vreg_name);
if (of_get_property(np, prop_name, NULL))
@ -2000,6 +2019,16 @@ static int sdhci_msm_vreg_init_reg(struct device *dev,
goto out;
}
if (vreg->multi_card_tray_wa_needed) {
vreg->reg_en_dis = devm_regulator_get(dev, vreg->en_dis_name);
if (IS_ERR(vreg->reg_en_dis)) {
ret = PTR_ERR(vreg->reg_en_dis);
pr_err("%s: devm_regulator_get(%s) failed. ret=%d\n",
__func__, vreg->en_dis_name, ret);
goto out;
}
}
if (regulator_count_voltages(vreg->reg) > 0) {
vreg->set_voltage_sup = true;
/* sanity check */
@ -2063,6 +2092,8 @@ static int sdhci_msm_vreg_set_voltage(struct sdhci_msm_reg_data *vreg,
static int sdhci_msm_vreg_enable(struct sdhci_msm_reg_data *vreg)
{
int ret = 0;
bool wa_needed = vreg->multi_card_tray_wa_needed;
const char *reg_name = wa_needed ? vreg->en_dis_name : vreg->name;
/* Put regulator in HPM (high power mode) */
ret = sdhci_msm_vreg_set_optimum_mode(vreg, vreg->hpm_uA);
@ -2076,10 +2107,14 @@ static int sdhci_msm_vreg_enable(struct sdhci_msm_reg_data *vreg)
if (ret)
return ret;
}
ret = regulator_enable(vreg->reg);
if (wa_needed)
ret = regulator_enable(vreg->reg_en_dis);
else
ret = regulator_enable(vreg->reg);
if (ret) {
pr_err("%s: regulator_enable(%s) failed. ret=%d\n",
__func__, vreg->name, ret);
__func__, reg_name, ret);
return ret;
}
vreg->is_enabled = true;
@ -2089,13 +2124,19 @@ static int sdhci_msm_vreg_enable(struct sdhci_msm_reg_data *vreg)
static int sdhci_msm_vreg_disable(struct sdhci_msm_reg_data *vreg)
{
int ret = 0;
bool wa_needed = vreg->multi_card_tray_wa_needed;
const char *reg_name = wa_needed ? vreg->en_dis_name : vreg->name;
/* Never disable regulator marked as always_on */
if (vreg->is_enabled && !vreg->is_always_on) {
ret = regulator_disable(vreg->reg);
if (vreg->multi_card_tray_wa_needed)
ret = regulator_disable(vreg->reg_en_dis);
else
ret = regulator_disable(vreg->reg);
if (ret) {
pr_err("%s: regulator_disable(%s) failed. ret=%d\n",
__func__, vreg->name, ret);
__func__, reg_name, ret);
goto out;
}
vreg->is_enabled = false;

7
drivers/mmc/host/sdhci-msm.h
View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2013-2014,2020-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef _DRIVERS_MMC_SDHCI_MSM_H
@ -134,8 +134,12 @@ struct sdhci_msm_reg_data {
struct sdhci_msm_host *msm_host;
/* voltage regulator handle */
struct regulator *reg;
/* Alternative voltage enable/disable regulator handle */
struct regulator *reg_en_dis;
/* regulator name */
const char *name;
/* regulator enable/disable name */
char en_dis_name[32];
/* voltage level to be set */
u32 low_vol_level;
u32 high_vol_level;
@ -151,6 +155,7 @@ struct sdhci_msm_reg_data {
bool lpm_sup;
bool set_voltage_sup;
bool is_voltage_supplied;
bool multi_card_tray_wa_needed;
};
/*