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

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

Merge "msm: 8092: Add clocks for vcap (version 2)"

parents 2fad10c9 a6cb01ed

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

+37 −17
Original line number Diff line number Diff line
@@ -6275,18 +6275,29 @@ static struct clk_lookup mpq_clocks_8092_rumi[] = { 
	CLK_DUMMY("",	oxili_gfx3d_clk.c,	"", OFF),

	CLK_DUMMY("",	oxilicx_ahb_clk.c,	"", OFF),

	CLK_DUMMY("",	bcss_mmss_ifdemod_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_afe_pixel_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_ahb_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_audio_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_axi_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_cfg_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_hdmi_bus_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_hdmi_rx_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_md_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_ttl_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_ttl_debug_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_vafe_ext_clk.c,	"", OFF),

	CLK_DUMMY("",	vcap_vp_clk.c,	"", OFF),

	CLK_DUMMY("pixel_clk", vcap_afe_pixel_clk.c,

		"fdfa8000.qcom,vcap_comp", OFF),

	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdf80000.qcom,vcap", OFF),

	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdfac000.qcom,vcap_ttl", OFF),

	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdf98000.qcom,hdmi_rx", OFF),

	CLK_DUMMY("bus_clk", vcap_axi_clk.c, "fdf80000.qcom,vcap", OFF),

	CLK_DUMMY("audio_clk", vcap_audio_clk.c, "fdf98000.qcom,hdmi_rx", OFF),

	CLK_DUMMY("cfg_clk", vcap_cfg_clk.c, "fdf98000.qcom,hdmi_rx", OFF),

	CLK_DUMMY("bus_clk", vcap_hdmi_bus_clk.c, "fdf98000.qcom,hdmi_rx", OFF),

	CLK_DUMMY("pixel_clk", vcap_hdmi_rx_clk.c,

		"fdf98000.qcom,hdmi_rx", OFF),

	CLK_DUMMY("md_clk",	vcap_md_clk.c,	"fdf98000.qcom,hdmi_rx", OFF),

	CLK_DUMMY("bus_clk",	vcap_ttl_clk.c,	"fdfac000.qcom,vcap_ttl", OFF),

	CLK_DUMMY("debug_clk",	vcap_ttl_debug_clk.c,

		"fdfac000.qcom,vcap_ttl", OFF),

	CLK_DUMMY("ext_clk",	vcap_vafe_ext_clk.c,

		"fdfa0000.qcom,vcap_sdvd", OFF),

	CLK_DUMMY("ext_clk",	vcap_vafe_ext_clk.c,

		"fdfa8000.qcom,vcap_comp", OFF),

	CLK_DUMMY("core_clk",	vcap_vp_clk.c,	"fdf80000.qcom,vcap", OFF),

	CLK_DUMMY("core_clk",	vcap_vp_clk.c,	"fdfac000.qcom,vcap_ttl", OFF),

	CLK_DUMMY("core_clk",	vcap_vp_clk.c,	"fdf98000.qcom,hdmi_rx", OFF),

	CLK_DUMMY("core_clk",	vcap_vp_clk.c,	"fdfa8000.qcom,vcap_comp", OFF),

	CLK_DUMMY("",   venus0_vcodec0_clk.c,   "", OFF),

	CLK_DUMMY("iface_clk",	venus0_ahb_clk.c, "fdce0000.qcom,venus", OFF),

	CLK_DUMMY("bus_clk",	venus0_axi_clk.c, "fdce0000.qcom,venus", OFF),
@@ -6655,11 +6666,20 @@ static struct clk_lookup mpq_clocks_8092[] = { 
	CLK_LOOKUP("",	oxili_gfx3d_clk.c,	""),

	CLK_LOOKUP("",	oxilicx_ahb_clk.c,	""),

	CLK_LOOKUP("",	bcss_mmss_ifdemod_clk.c,	""),

	CLK_LOOKUP("",	vcap_ahb_clk.c,	""),

	CLK_LOOKUP("",	vcap_axi_clk.c,	""),

	CLK_LOOKUP("",	vcap_cfg_clk.c,	""),

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

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

	CLK_LOOKUP("iface_clk",	vcap_ahb_clk.c,	"fdf80000.qcom,vcap"),

	CLK_LOOKUP("iface_clk",	vcap_ahb_clk.c,	"fdfac000.qcom,vcap_ttl"),

	CLK_LOOKUP("iface_clk",	vcap_ahb_clk.c,	"fdf98000.qcom,hdmi_rx"),

	CLK_LOOKUP("bus_clk",	vcap_axi_clk.c,	"fdf80000.qcom,vcap"),

	CLK_LOOKUP("cfg_clk",	vcap_cfg_clk.c, "fdf98000.qcom,hdmi_rx"),

/*

	CLK_LOOKUP("bus_clk",  vcap_hdmi_bus_clk.c, "fdf98000.qcom,hdmi_rx"),

	CLK_LOOKUP("pixel_clk", vcap_hdmi_rx_clk.c, "fdf98000.qcom,hdmi_rx"),

	CLK_LOOKUP("audio_clk", vcap_audio_clk.c, "fdf98000.qcom,hdmi_rx"),

*/

	CLK_LOOKUP("md_clk", vcap_md_clk.c,	"fdf98000.qcom,hdmi_rx"),

	CLK_LOOKUP("core_clk",	vcap_vp_clk.c,	"fdf80000.qcom,vcap"),

	CLK_LOOKUP("core_clk",	vcap_vp_clk.c,	"fdfac000.qcom,vcap_ttl"),

	CLK_LOOKUP("core_clk",	vcap_vp_clk.c,	"fdf98000.qcom,hdmi_rx"),

	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,	""),