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

Commit 2e2e5b8b 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: Support new bimc_gpu node clock for MSMgold"

parents 7082c6e5 ff6fd510

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

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ DEFINE_CLK_RPM_SMD_BRANCH(xo_clk_src, xo_a_clk_src, RPM_MISC_CLK_TYPE, 
				CXO_CLK_SRC_ID, 19200000);

DEFINE_CLK_RPM_SMD(pnoc_clk, pnoc_a_clk, RPM_BUS_CLK_TYPE, PNOC_CLK_ID, NULL);

DEFINE_CLK_RPM_SMD(bimc_clk, bimc_a_clk, RPM_MEM_CLK_TYPE, BIMC_CLK_ID, NULL);

DEFINE_CLK_RPM_SMD(bimc_gpu_clk, bimc_gpu_a_clk, RPM_MEM_CLK_TYPE,

						BIMC_GPU_CLK_ID, NULL);

DEFINE_CLK_RPM_SMD(snoc_clk, snoc_a_clk, RPM_BUS_CLK_TYPE, SNOC_CLK_ID, NULL);

DEFINE_CLK_RPM_SMD(sysmmnoc_clk, sysmmnoc_a_clk, RPM_BUS_CLK_TYPE,

						SYSMMNOC_CLK_ID, NULL);
@@ -3956,6 +3958,8 @@ static struct clk_lookup msm_clocks_lookup_gold[] = { 
	CLK_LIST(gpll0_clk_src_8937),

	CLK_LIST(gpll0_ao_clk_src_8937),

	CLK_LIST(gpll0_sleep_clk_src),

	CLK_LIST(bimc_gpu_clk),

	CLK_LIST(bimc_gpu_a_clk),

	CLK_LIST(gcc_dcc_clk),

	CLK_LIST(gcc_qdss_dap_clk),

	CLK_LIST(gcc_gfx_tcu_clk),

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

+2 −0
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ 
#define clk_bimc_msmbus_a_clk			0x71d1a499

#define clk_bimc_usb_a_clk			0xea410834

#define clk_bimc_usb_clk			0x9bd2b2bf

#define clk_bimc_gpu_clk			0xd3e0a327

#define clk_bimc_gpu_a_clk			0x67f0e9a5

#define clk_qdss_clk				0x1492202a

#define clk_qdss_a_clk				0xdd121669

#define clk_xo_clk_src				0x23f5649f

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

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ 
#define SNOC_CLK_ID			0x1

#define SYSMMNOC_CLK_ID			0x2

#define BIMC_CLK_ID			0x0

#define BIMC_GPU_CLK_ID			0x2

#define IPA_CLK_ID			0x0



#define BUS_SCALING		0x2