Merge "Revert "mmc: sdhci-msm: Add support to vote for vdd io parent regulator"" (27341b8e) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/mmc/host/sdhci-msm.c

+21 −41

Original line number	Diff line number	Diff line
		@@ -2201,6 +2201,23 @@ static int sdhci_msm_dt_parse_hsr_info(struct device *dev,
		return ret;
		}

		int sdhci_msm_parse_reset_data(struct device *dev,
		struct sdhci_msm_host *msm_host)
		{
		int ret = 0;

		msm_host->core_reset = devm_reset_control_get(dev,
		"core_reset");
		if (IS_ERR(msm_host->core_reset)) {
		ret = PTR_ERR(msm_host->core_reset);
		dev_err(dev, "core_reset unavailable,err = %d\n",
		ret);
		msm_host->core_reset = NULL;
		}

		return ret;
		}

		static int sdhci_msm_parse_regulator_info(struct device *dev,
		struct sdhci_msm_pltfm_data *pdata)
		{
		@@ -2226,34 +2243,11 @@ static int sdhci_msm_parse_regulator_info(struct device *dev,
		goto out;
		}

		if (sdhci_msm_dt_parse_vreg_info(dev,
		&pdata->vreg_data->vdd_io_bias_data,
		"vdd-io-bias")) {
		dev_err(dev, "No vdd-io-bias regulator data\n");
		}

		return ret;
		out:
		return -EINVAL;
		}

		int sdhci_msm_parse_reset_data(struct device *dev,
		struct sdhci_msm_host *msm_host)
		{
		int ret = 0;

		msm_host->core_reset = devm_reset_control_get(dev,
		"core_reset");
		if (IS_ERR(msm_host->core_reset)) {
		ret = PTR_ERR(msm_host->core_reset);
		dev_err(dev, "core_reset unavailable,err = %d\n",
		ret);
		msm_host->core_reset = NULL;
		}

		return ret;
		}

		/* Parse platform data */
		static
		struct sdhci_msm_pltfm_data sdhci_msm_populate_pdata(struct device dev,
		@@ -2349,6 +2343,7 @@ struct sdhci_msm_pltfm_data sdhci_msm_populate_pdata(struct device dev,
		MMC_SCALING_LOWER_DDR52_MODE;
		}

		/* Add func to avoid merge warnings*/
		if (sdhci_msm_parse_regulator_info(dev, pdata))
		goto out;

		@@ -2899,7 +2894,7 @@ static int sdhci_msm_setup_vreg(struct sdhci_msm_pltfm_data *pdata,
		{
		int ret = 0, i;
		struct sdhci_msm_slot_reg_data *curr_slot;
		struct sdhci_msm_reg_data *vreg_table[3];
		struct sdhci_msm_reg_data *vreg_table[2];

		curr_slot = pdata->vreg_data;
		if (!curr_slot) {
		@@ -2910,7 +2905,6 @@ static int sdhci_msm_setup_vreg(struct sdhci_msm_pltfm_data *pdata,

		vreg_table[0] = curr_slot->vdd_data;
		vreg_table[1] = curr_slot->vdd_io_data;
		vreg_table[2] = curr_slot->vdd_io_bias_data;

		for (i = 0; i < ARRAY_SIZE(vreg_table); i++) {
		if (vreg_table[i]) {
		@@ -2933,8 +2927,7 @@ static int sdhci_msm_vreg_init(struct device *dev,
		{
		int ret = 0;
		struct sdhci_msm_slot_reg_data *curr_slot;
		struct sdhci_msm_reg_data curr_vdd_reg, curr_vdd_io_reg,
		*curr_vdd_io_bias_reg;
		struct sdhci_msm_reg_data curr_vdd_reg, curr_vdd_io_reg;

		curr_slot = pdata->vreg_data;
		if (!curr_slot)
		@@ -2942,11 +2935,10 @@ static int sdhci_msm_vreg_init(struct device *dev,

		curr_vdd_reg = curr_slot->vdd_data;
		curr_vdd_io_reg = curr_slot->vdd_io_data;
		curr_vdd_io_bias_reg = curr_slot->vdd_io_bias_data;

		if (!is_init)
		/* Deregister all regulators from regulator framework */
		goto vdd_io_bias_reg_deinit;
		goto vdd_io_reg_deinit;

		/*
		* Get the regulator handle from voltage regulator framework
		@@ -2962,19 +2954,11 @@ static int sdhci_msm_vreg_init(struct device *dev,
		if (ret)
		goto vdd_reg_deinit;
		}
		if (curr_vdd_io_bias_reg) {
		ret = sdhci_msm_vreg_init_reg(dev, curr_vdd_io_bias_reg);
		if (ret)
		goto vdd_io_reg_deinit;
		}

		if (ret)
		dev_err(dev, "vreg reset failed (%d)\n", ret);
		goto out;

		vdd_io_bias_reg_deinit:
		if (curr_vdd_io_bias_reg)
		sdhci_msm_vreg_deinit_reg(curr_vdd_io_bias_reg);
		vdd_io_reg_deinit:
		if (curr_vdd_io_reg)
		sdhci_msm_vreg_deinit_reg(curr_vdd_io_reg);
		@@ -3158,8 +3142,6 @@ static irqreturn_t sdhci_msm_pwr_irq(int irq, void *data)
		int ret = 0;
		int pwr_state = 0, io_level = 0;
		unsigned long flags;
		struct sdhci_msm_reg_data *vreg_io_bias =
		msm_host->pdata->vreg_data->vdd_io_bias_data;

		irq_status = sdhci_msm_readb_relaxed(host,
		msm_host_offset->CORE_PWRCTL_STATUS);
		@@ -3206,8 +3188,6 @@ static irqreturn_t sdhci_msm_pwr_irq(int irq, void *data)
		if (irq_status & CORE_PWRCTL_IO_LOW) {
		/* Switch voltage Low */
		ret = sdhci_msm_set_vdd_io_vol(msm_host->pdata, VDD_IO_LOW, 0);
		if (!ret && vreg_io_bias)
		ret = sdhci_msm_vreg_disable(vreg_io_bias);
		if (ret)
		irq_ack \|= CORE_PWRCTL_IO_FAIL;
		else

drivers/mmc/host/sdhci-msm.h

+1 −3

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
		*
		*/

		@@ -104,8 +104,6 @@ struct sdhci_msm_slot_reg_data {
		struct sdhci_msm_reg_data *vdd_data;
		/* keeps VDD IO regulator info */
		struct sdhci_msm_reg_data *vdd_io_data;
		/* Keeps VDD IO parent regulator info*/
		struct sdhci_msm_reg_data *vdd_io_bias_data;
		};

		struct sdhci_msm_gpio {