Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2ac8b62 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: Avoid turning off the CPUSS AHB clocks during LPM state"

parents 448c7085 f9dfaa55

drivers/clk/qcom/gcc-sdm845.c

+0 −11
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
#include "clk-alpha-pll.h"

#include "vdd-level-sdm845.h"



#define GCC_APCS_CLOCK_SLEEP_ENA_VOTE_OFFSET	0x52008

#define CPUSS_AHB_CLK_SLEEP_ENA			BIT(21)

#define SYS_NOC_CPUSS_AHB_CLK_SLEEP_ENA		BIT(0)

#define GCC_MMSS_MISC				0x09FFC

#define GCC_GPU_MISC				0x71028
@@ -4288,14 +4285,6 @@ static int gcc_sdm845_probe(struct platform_device *pdev) 
	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



	/*

	 * Set the *_SLEEP_ENA bits to allow certain cpuss* clocks to be

	 * turned off by hardware during certain apps low power modes.

	 */

	regmap_update_bits(regmap, GCC_APCS_CLOCK_SLEEP_ENA_VOTE_OFFSET,

		CPUSS_AHB_CLK_SLEEP_ENA | SYS_NOC_CPUSS_AHB_CLK_SLEEP_ENA,

		CPUSS_AHB_CLK_SLEEP_ENA | SYS_NOC_CPUSS_AHB_CLK_SLEEP_ENA);



	vdd_cx.regulator[0] = devm_regulator_get(&pdev->dev, "vdd_cx");

	if (IS_ERR(vdd_cx.regulator[0])) {

		if (!(PTR_ERR(vdd_cx.regulator[0]) == -EPROBE_DEFER))