Merge "clk: qcom: gdsc-regulator: Add MMCX specific logic" (475c676e) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/clk/qcom/gdsc-regulator.c

+70 −3

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ static int poll_gdsc_status(struct gdsc *sc, enum gdscr_status status)
		* bit in the GDSCR to be set or reset after the GDSC state
		* changes. Hence, keep on checking for a reasonable number
		* of times until the bit is set with the least possible delay
		* between succeessive tries.
		* between successive tries.
		*/
		udelay(1);
		}
		@@ -147,6 +147,30 @@ static int gdsc_is_enabled(struct regulator_dev *rdev)
		if (!sc->toggle_logic)
		return !sc->resets_asserted;

		if (sc->parent_regulator) {
		/*
		* The parent regulator for the GDSC is required to be on to
		* make any register accesses to the GDSC base. Return false
		* if the parent supply is disabled.
		*/
		if (regulator_is_enabled(sc->parent_regulator) <= 0)
		return false;

		/*
		* Place an explicit vote on the parent rail to cover cases when
		* it might be disabled between this point and reading the GDSC
		* registers.
		*/
		if (regulator_set_voltage(sc->parent_regulator,
		RPMH_REGULATOR_LEVEL_LOW_SVS, INT_MAX))
		return false;

		if (regulator_enable(sc->parent_regulator)) {
		regulator_set_voltage(sc->parent_regulator, 0, INT_MAX);
		return false;
		}
		}

		regmap_read(sc->regmap, REG_OFFSET, &regval);

		if (regval & PWR_ON_MASK) {
		@@ -155,10 +179,20 @@ static int gdsc_is_enabled(struct regulator_dev *rdev)
		* votable GDS registers. Check the SW_COLLAPSE_MASK to
		* determine if HLOS has voted for it.
		*/
		if (!(regval & SW_COLLAPSE_MASK))
		if (!(regval & SW_COLLAPSE_MASK)) {
		if (sc->parent_regulator) {
		regulator_disable(sc->parent_regulator);
		regulator_set_voltage(sc->parent_regulator, 0,
		INT_MAX);
		}
		return true;
		}
		}

		if (sc->parent_regulator) {
		regulator_disable(sc->parent_regulator);
		regulator_set_voltage(sc->parent_regulator, 0, INT_MAX);
		}
		return false;
		}

		@@ -412,9 +446,33 @@ static unsigned int gdsc_get_mode(struct regulator_dev *rdev)
		{
		struct gdsc *sc = rdev_get_drvdata(rdev);
		uint32_t regval;
		int ret;

		mutex_lock(&gdsc_seq_lock);

		if (sc->parent_regulator) {
		ret = regulator_set_voltage(sc->parent_regulator,
		RPMH_REGULATOR_LEVEL_LOW_SVS, INT_MAX);
		if (ret) {
		mutex_unlock(&gdsc_seq_lock);
		return ret;
		}

		ret = regulator_enable(sc->parent_regulator);
		if (ret) {
		regulator_set_voltage(sc->parent_regulator, 0, INT_MAX);
		mutex_unlock(&gdsc_seq_lock);
		return ret;
		}
		}

		regmap_read(sc->regmap, REG_OFFSET, &regval);

		if (sc->parent_regulator) {
		regulator_disable(sc->parent_regulator);
		regulator_set_voltage(sc->parent_regulator, 0, INT_MAX);
		}

		mutex_unlock(&gdsc_seq_lock);

		if (regval & HW_CONTROL_MASK)
		@@ -438,6 +496,13 @@ static int gdsc_set_mode(struct regulator_dev *rdev, unsigned int mode)
		mutex_unlock(&gdsc_seq_lock);
		return ret;
		}

		ret = regulator_enable(sc->parent_regulator);
		if (ret) {
		regulator_set_voltage(sc->parent_regulator, 0, INT_MAX);
		mutex_unlock(&gdsc_seq_lock);
		return ret;
		}
		}

		regmap_read(sc->regmap, REG_OFFSET, &regval);
		@@ -483,8 +548,10 @@ static int gdsc_set_mode(struct regulator_dev *rdev, unsigned int mode)
		break;
		}

		if (sc->parent_regulator)
		if (sc->parent_regulator) {
		regulator_disable(sc->parent_regulator);
		regulator_set_voltage(sc->parent_regulator, 0, INT_MAX);
		}

		mutex_unlock(&gdsc_seq_lock);