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

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

Merge "qcom: clock-rpm-8994: Switch modem pnoc vote to an exclusive voter"

parents 3a9ea1ce 297beb82

arch/arm/boot/dts/qcom/msm8994.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1778,7 +1778,7 @@ 


		clocks = <&clock_rpm clk_cxo_clk_src>,

			 <&clock_rpm clk_mss_cfg_ahb_clk>,

			 <&clock_rpm clk_pnoc_clk>,

			 <&clock_rpm clk_pnoc_modem_clk>,

			 <&clock_gcc clk_gcc_mss_q6_bimc_axi_clk>,

			 <&clock_gcc clk_gcc_boot_rom_ahb_clk>,

			 <&clock_gcc clk_gpll0_out_msscc>;

drivers/clk/qcom/clock-rpm-8994.c

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static DEFINE_CLK_VOTER(ocmemgx_msmbus_a_clk, &ocmemgx_a_clk.c, LONG_MAX); 
static DEFINE_CLK_VOTER(oxili_gfx3d_clk_src, &gfx3d_clk_src.c, LONG_MAX);

static DEFINE_CLK_VOTER(pnoc_keepalive_a_clk, &pnoc_a_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(pnoc_msmbus_clk, &pnoc_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(pnoc_modem_clk, &pnoc_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(pnoc_msmbus_a_clk, &pnoc_a_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(pnoc_pm_clk, &pnoc_clk.c, LONG_MAX);

static DEFINE_CLK_VOTER(pnoc_sps_clk, &pnoc_clk.c, 0);
@@ -247,6 +248,7 @@ static struct clk_lookup msm_clocks_rpm_8994[] = { 
	CLK_LIST(ocmemgx_msmbus_a_clk),

	CLK_LIST(oxili_gfx3d_clk_src),

	CLK_LIST(pnoc_keepalive_a_clk),

	CLK_LIST(pnoc_modem_clk),

	CLK_LIST(pnoc_msmbus_clk),

	CLK_LIST(pnoc_msmbus_a_clk),

	CLK_LIST(pnoc_pm_clk),

include/dt-bindings/clock/msm-clocks-8994.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#define clk_ocmemgx_msmbus_a_clk 0x66dd774f

#define clk_oxili_gfx3d_clk_src 0xe0405056

#define clk_pnoc_keepalive_a_clk 0xf8f91f0b

#define clk_pnoc_modem_clk 0x822f0471

#define clk_pnoc_msmbus_clk 0x38b95c77

#define clk_pnoc_msmbus_a_clk 0x8c9b4e93

#define clk_pnoc_pm_clk 0xd6f7dfb9