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

Commit 84a40fce 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-8996: Control gcc_aggre0_noc_mpu_cfg_ahb_clk from HLOS"

parents c28678a6 287ccf10

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

+13 −0
Original line number Diff line number Diff line
@@ -3130,6 +3130,17 @@ static struct branch_clk gcc_dcc_ahb_clk = { 
	},

};



static struct branch_clk gcc_aggre0_noc_mpu_cfg_ahb_clk = {

	.cbcr_reg = GCC_AGGRE0_NOC_MPU_CFG_AHB_CBCR,

	.has_sibling = 1,

	.base = &virt_base,

	.c = {

		.dbg_name = "gcc_aggre0_noc_mpu_cfg_ahb_clk",

		.ops = &clk_ops_branch,

		CLK_INIT(gcc_aggre0_noc_mpu_cfg_ahb_clk.c),

	},

};



static struct mux_clk gcc_debug_mux;

static struct mux_clk gcc_debug_mux_v2;

static struct clk_ops clk_ops_debug_mux;
@@ -3276,6 +3287,7 @@ static struct mux_clk gcc_debug_mux = { 
		{ &gcc_aggre2_ufs_axi_clk.c, 0x0126 },

		{ &gcc_aggre2_usb3_axi_clk.c, 0x0127 },

		{ &gcc_dcc_ahb_clk.c, 0x012b },

		{ &gcc_aggre0_noc_mpu_cfg_ahb_clk.c, 0x012c},

		{ &ipa_clk.c, 0x12f },

	),

	.c = {
@@ -3568,6 +3580,7 @@ static struct clk_lookup msm_clocks_gcc_8996[] = { 
	CLK_LIST(gcc_mmss_bimc_gfx_clk),

	CLK_LIST(gcc_bimc_gfx_clk),

	CLK_LIST(gcc_dcc_ahb_clk),

	CLK_LIST(gcc_aggre0_noc_mpu_cfg_ahb_clk),

};



static struct clk_lookup msm_clocks_gcc_8996_v2[] = {

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

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ 
#define clk_gpll0_out_msscc		0x7d794829

#define clk_gcc_debug_mux_v2		0xf7e749f0

#define clk_gcc_dcc_ahb_clk		0xfa14a88c

#define clk_gcc_aggre0_noc_mpu_cfg_ahb_clk	0x5c1bb8e2



/* clock_mmss controlled clocks */

#define clk_mmsscc_xo			0x05e63704

include/dt-bindings/clock/msm-clocks-hwio-8996.h

+1 −0
Original line number Diff line number Diff line
@@ -494,3 +494,4 @@ 
#define GCC_MSS_SNOC_AXI_CBCR					(0x8A024)

#define GCC_MSS_MNOC_BIMC_AXI_CBCR				(0x8A004)

#define GCC_DCC_AHB_CBCR					(0x84004)

#define GCC_AGGRE0_NOC_MPU_CFG_AHB_CBCR				(0x85000)