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

Commit 1dd21f9d 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-8084: Register VPU device clocks in clock lookup table"

parents d48b00ea 9ebe547c

arch/arm/mach-msm/clock-8084.c

+10 −8
Original line number Diff line number Diff line
@@ -5816,7 +5816,6 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("reg_clk",	dummy_clk,	"fe200000.qcom,lpass"),

	CLK_LOOKUP("",	gcc_lpass_sway_clk.c,	""),



	CLK_LOOKUP("",	gcc_mmss_vpu_maple_sys_noc_axi_clk.c,	""),

	CLK_LOOKUP("",	gcc_pdm2_clk.c,	""),

	CLK_LOOKUP("",	gcc_pdm_ahb_clk.c,	""),

	CLK_LOOKUP("",	gcc_periph_noc_usb_hsic_ahb_clk.c,	""),
@@ -6124,13 +6123,16 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("core_clk",	venus0_vcodec0_clk.c,

						 "fdce0000.qcom,venus"),



	CLK_LOOKUP("",	vpu_ahb_clk.c,	""),

	CLK_LOOKUP("",	vpu_axi_clk.c,	""),

	CLK_LOOKUP("",	vpu_bus_clk.c,	""),

	CLK_LOOKUP("",	vpu_cxo_clk.c,	""),

	CLK_LOOKUP("",	vpu_maple_clk.c,	""),

	CLK_LOOKUP("",	vpu_sleep_clk.c,	""),

	CLK_LOOKUP("",	vpu_vdp_clk.c,	""),

	CLK_LOOKUP("iface_clk", vpu_ahb_clk.c, "fde0b000.qcom,vpu"),

	CLK_LOOKUP("bus_clk", vpu_axi_clk.c, "fde0b000.qcom,vpu"),

	CLK_LOOKUP("vdp_clk", vpu_vdp_clk.c, "fde0b000.qcom,vpu"),

	CLK_LOOKUP("vdp_bus_clk", vpu_bus_clk.c, "fde0b000.qcom,vpu"),

	CLK_LOOKUP("cxo_clk", vpu_cxo_clk.c, "fde0b000.qcom,vpu"),

	CLK_LOOKUP("core_clk", vpu_maple_clk.c, "fde0b000.qcom,vpu"),

	CLK_LOOKUP("sleep_clk", vpu_sleep_clk.c, "fde0b000.qcom,vpu"),

	CLK_LOOKUP("maple_bus_clk", gcc_mmss_vpu_maple_sys_noc_axi_clk.c,

						"fde0b000.qcom,vpu"),

	CLK_LOOKUP("prng_clk", gcc_prng_ahb_clk.c, "fde0b000.qcom,vpu"),



	/* IOMMU clocks */

	CLK_LOOKUP("iface_clk", camss_jpeg_jpeg_ahb_clk.c,