Merge "clk: qcom: gdsc-regulator: Update support to skip GDSC disable" (5382f156) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/clk/qcom/gdsc-regulator.c

+6 −11

Original line number	Diff line number	Diff line
		@@ -146,6 +146,9 @@ static int gdsc_is_enabled(struct regulator_dev *rdev)
		if (!sc->toggle_logic)
		return !sc->resets_asserted;

		if (sc->skip_disable_before_enable)
		return false;

		if (sc->parent_regulator) {
		/*
		* The parent regulator for the GDSC is required to be on to
		@@ -209,6 +212,9 @@ static int gdsc_enable(struct regulator_dev *rdev)
		uint32_t regval, hw_ctrl_regval = 0x0;
		int i, ret = 0;

		if (sc->skip_disable_before_enable)
		return 0;

		if (sc->parent_regulator) {
		ret = regulator_set_voltage(sc->parent_regulator,
		RPMH_REGULATOR_LEVEL_LOW_SVS, INT_MAX);
		@@ -367,7 +373,6 @@ static int gdsc_enable(struct regulator_dev *rdev)
		clk_disable_unprepare(sc->clocks[sc->root_clk_idx]);

		sc->is_gdsc_enabled = true;
		sc->skip_disable_before_enable = false;
		end:
		if (ret && sc->bus_handle) {
		msm_bus_scale_client_update_request(sc->bus_handle, 0);
		@@ -386,16 +391,6 @@ static int gdsc_disable(struct regulator_dev *rdev)
		uint32_t regval;
		int i, ret = 0;

		/*
		* Protect GDSC against late_init disabling when the GDSC is enabled
		* by an entity outside external to HLOS.
		*/
		if (sc->skip_disable_before_enable) {
		dev_dbg(&rdev->dev, "Skip Disabling: %s\n", sc->rdesc.name);
		sc->skip_disable_before_enable = false;
		return 0;
		}

		if (sc->force_root_en)
		clk_prepare_enable(sc->clocks[sc->root_clk_idx]);