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

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

Merge "msm: clock-8916: clock changes for 8916"

parents 72c23a90 deb20fb5

drivers/clk/qcom/clock-gcc-8916.c

+2 −2
Original line number Diff line number Diff line
@@ -2053,7 +2053,7 @@ static struct branch_clk gcc_oxili_ahb_clk = { 


static struct branch_clk gcc_oxili_gfx3d_clk = {

	.cbcr_reg = OXILI_GFX3D_CBCR,

	.has_sibling = 1,

	.has_sibling = 0,

	.base = &virt_bases[GCC_BASE],

	.c = {

		.dbg_name = "gcc_oxili_gfx3d_clk",
@@ -2449,7 +2449,7 @@ static struct mux_clk gcc_debug_mux = { 
		{&gcc_mdss_vsync_clk.c,			0x01fb},

		{&gcc_mdss_byte0_clk.c,			0x01fc},

		{&gcc_mdss_esc0_clk.c,			0x01fd},

		{&gcc_bimc_gpu_clk.c,			0x015c},

		{&gcc_bimc_gpu_clk.c,			0x0157},

		{&wcnss_m_clk.c,			0x0198},

	),

	.c = {

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

+3 −2
Original line number Diff line number Diff line
@@ -96,9 +96,8 @@ static DEFINE_CLK_BRANCH_VOTER(xo_gcc, &xo_clk_src.c); 
static DEFINE_CLK_BRANCH_VOTER(xo_otg_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_lpm_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_pil_pronto_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_mss_pil_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_pil_mss_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_wlan_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_pil_mba_clk, &xo_clk_src.c);



static struct mux_clk rpm_debug_mux = {

	.ops = &mux_reg_ops,
@@ -129,6 +128,8 @@ static struct clk_lookup msm_clocks_rpm[] = { 
	CLK_LIST(xo_a_clk_src),

	CLK_LIST(xo_otg_clk),

	CLK_LIST(xo_lpm_clk),

	CLK_LIST(xo_pil_mss_clk),

	CLK_LIST(xo_pil_pronto_clk),



	CLK_LIST(snoc_msmbus_clk),

	CLK_LIST(snoc_msmbus_a_clk),