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

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

Merge "clk: msm: clock-gcc-titanium: add voter clocks for MDSS rotator"

parents 10d0167c 42375457

drivers/clk/msm/clock-gcc-titanium.c

+5 −0
Original line number Diff line number Diff line
@@ -2630,6 +2630,9 @@ static struct branch_clk gcc_mdss_mdp_clk = { 
	},

};



static DEFINE_CLK_VOTER(mdss_mdp_vote_clk, &gcc_mdss_mdp_clk.c, 0);

static DEFINE_CLK_VOTER(mdss_rotator_vote_clk, &gcc_mdss_mdp_clk.c, 0);



static struct branch_clk gcc_mdss_pclk0_clk = {

	.cbcr_reg = MDSS_PCLK0_CBCR,

	.has_sibling = 1,
@@ -3792,6 +3795,8 @@ static struct clk_lookup msm_clocks_gcc_mdss[] = { 
	CLK_LIST(gcc_mdss_pclk1_clk),

	CLK_LIST(gcc_mdss_byte0_clk),

	CLK_LIST(gcc_mdss_byte1_clk),

	CLK_LIST(mdss_mdp_vote_clk),

	CLK_LIST(mdss_rotator_vote_clk),

};



static int msm_gcc_mdss_probe(struct platform_device *pdev)

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

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ 
#define clk_ext_pclk0_clk_src				 0x087c1612

#define clk_pclk1_clk_src				 0x090f68ac

#define clk_ext_pclk1_clk_src				 0x8067c5a3

#define clk_mdss_mdp_vote_clk				 0x588460a4

#define clk_mdss_rotator_vote_clk			 0x5b1f675e

#define clk_usb30_master_clk_src			 0xc6262f89

#define clk_vfe1_clk_src				 0x4e357366

#define clk_apc0_droop_detector_clk_src			 0x824a5cb7