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

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

Merge "clock: mpq8092: update clk lookup table with proper dev_id"

parents 8fbc2211 e7bacd7e

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

+18 −13
Original line number Diff line number Diff line
@@ -6395,16 +6395,18 @@ static struct clk_lookup mpq_clocks_8092[] = { 
	CLK_LOOKUP("ocmem_a_clk", ocmemgx_msmbus_a_clk.c, "msm_bus"),

	CLK_LOOKUP("dfab_clk", pnoc_sps_clk.c, "msm_sps"),



	CLK_LOOKUP("",	gcc_bam_dma_ahb_clk.c,	""),

	CLK_LOOKUP("dma_bam_pclk", gcc_bam_dma_ahb_clk.c, "msm_sps"),

	CLK_LOOKUP("",	gcc_bcss_cfg_ahb_clk.c,	""),

	CLK_LOOKUP("",	gcc_bcss_sleep_clk.c,	""),

	CLK_LOOKUP("",	gcc_tsif_ref_clk.c,	""),



	/* BLSP1 */

	CLK_LOOKUP("iface_clk",	gcc_blsp1_ahb_clk.c,	"f991f000.serial"),

	CLK_LOOKUP("iface_clk", gcc_blsp1_ahb_clk.c,    "f9923000.spi"),

	CLK_LOOKUP("iface_clk", gcc_blsp1_ahb_clk.c,    "f9924000.i2c"),

	CLK_LOOKUP("",	gcc_blsp1_qup1_i2c_apps_clk.c,	""),

	CLK_LOOKUP("",	gcc_blsp1_qup1_spi_apps_clk.c,	""),

	CLK_LOOKUP("",	gcc_blsp1_qup2_i2c_apps_clk.c,	""),

	CLK_LOOKUP("core_clk",	gcc_blsp1_qup1_spi_apps_clk.c,	"f9923000.spi"),

	CLK_LOOKUP("core_clk",	gcc_blsp1_qup2_i2c_apps_clk.c,	"f9924000.i2c"),

	CLK_LOOKUP("",	gcc_blsp1_qup2_spi_apps_clk.c,	""),

	CLK_LOOKUP("",	gcc_blsp1_qup3_i2c_apps_clk.c,	""),

	CLK_LOOKUP("",	gcc_blsp1_qup3_spi_apps_clk.c,	""),
@@ -6493,7 +6495,7 @@ static struct clk_lookup mpq_clocks_8092[] = { 


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

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

	CLK_LOOKUP("",	gcc_prng_ahb_clk.c,	""),

	CLK_LOOKUP("core_clk", gcc_prng_ahb_clk.c, "f9bff000.qcom,msm-rng"),

	CLK_LOOKUP("",	gcc_pwm_ahb_clk.c,	""),

	CLK_LOOKUP("",	gcc_pwm_clk.c,	""),

	CLK_LOOKUP("",	gcc_spss_ahb_clk.c,	""),
@@ -6507,10 +6509,10 @@ static struct clk_lookup mpq_clocks_8092[] = { 
	CLK_LOOKUP("",	gcc_sata_rx_oob_clk.c,	""),



	/* SDCC */

	CLK_LOOKUP("",	gcc_sdcc1_ahb_clk.c,	""),

	CLK_LOOKUP("",	gcc_sdcc1_apps_clk.c,	""),

	CLK_LOOKUP("",	gcc_sdcc2_ahb_clk.c,	""),

	CLK_LOOKUP("",	gcc_sdcc2_apps_clk.c,	""),

	CLK_LOOKUP("iface_clk",	gcc_sdcc1_ahb_clk.c,	"msm_sdcc.1"),

	CLK_LOOKUP("core_clk",	gcc_sdcc1_apps_clk.c,	"msm_sdcc.1"),

	CLK_LOOKUP("iface_clk",	gcc_sdcc2_ahb_clk.c,	"msm_sdcc.2"),

	CLK_LOOKUP("core_clk",	gcc_sdcc2_apps_clk.c,	"msm_sdcc.2"),



	/* USB */

	CLK_LOOKUP("",	gcc_sys_noc_usb3_axi_clk.c,	""),
@@ -6552,7 +6554,8 @@ static struct clk_lookup mpq_clocks_8092[] = { 
	CLK_LOOKUP("",	mmss_mmssnoc_axi_clk.c,	""),

	CLK_LOOKUP("",	mmss_s0_axi_clk.c,	""),

	CLK_LOOKUP("",	ocmemcx_ahb_clk.c,	""),

	CLK_LOOKUP("",	ocmemcx_ocmemnoc_clk.c,	""),

	CLK_LOOKUP("core_clk",  ocmemgx_core_clk.c,	"fdd00000.qcom,ocmem"),

	CLK_LOOKUP("iface_clk",	ocmemcx_ocmemnoc_clk.c,	"fdd00000.qcom,ocmem"),

	CLK_LOOKUP("",	oxili_ocmemgx_clk.c,	""),

	CLK_LOOKUP("",	oxili_gfx3d_clk.c,	""),

	CLK_LOOKUP("",	oxilicx_ahb_clk.c,	""),
@@ -6562,12 +6565,14 @@ static struct clk_lookup mpq_clocks_8092[] = { 
	CLK_LOOKUP("",	vcap_cfg_clk.c,	""),

	CLK_LOOKUP("",	vcap_md_clk.c,	""),

	CLK_LOOKUP("",	vcap_vp_clk.c,	""),

	CLK_LOOKUP("",	venus0_ahb_clk.c,	""),

	CLK_LOOKUP("",	venus0_axi_clk.c,	""),

	CLK_LOOKUP("iface_clk",	venus0_ahb_clk.c, "fdce0000.qcom,venus"),

	CLK_LOOKUP("bus_clk",	venus0_axi_clk.c, "fdce0000.qcom,venus"),

	CLK_LOOKUP("",	venus0_core0_vcodec_clk.c,	""),

	CLK_LOOKUP("",	venus0_core1_vcodec_clk.c,	""),

	CLK_LOOKUP("",	venus0_ocmemnoc_clk.c,	""),

	CLK_LOOKUP("",	venus0_vcodec0_clk.c,	""),

	CLK_LOOKUP("mem_clk",	venus0_ocmemnoc_clk.c,

						 "fdce0000.qcom,venus"),

	CLK_LOOKUP("core_clk",	venus0_vcodec0_clk.c,

						 "fdce0000.qcom,venus"),

	CLK_LOOKUP("",	vcodec0_clk_src.c,	""),

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

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