Merge "msm: clock-8092: Update clock devicetree props to return back to qcom" (8a32d292) · Commits · e / devices / android_kernel_sony_msm8994

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

+40 −40

Original line number	Original line	Diff line number	Diff line
	@@ -6357,33 +6357,33 @@ static struct clk_lookup mpq_clocks_8092_rumi[] = {
	CLK_DUMMY("", oxilicx_ahb_clk.c, "", OFF),		CLK_DUMMY("", oxilicx_ahb_clk.c, "", OFF),
	CLK_DUMMY("", bcss_mmss_ifdemod_clk.c, "", OFF),		CLK_DUMMY("", bcss_mmss_ifdemod_clk.c, "", OFF),
	CLK_DUMMY("pixel_clk", vcap_afe_pixel_clk.c,		CLK_DUMMY("pixel_clk", vcap_afe_pixel_clk.c,
	"fdfa8000.qti,vcap_comp", OFF),		"fdfa8000.qcom,vcap_comp", OFF),
	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdf80000.qti,vcap", OFF),		CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdf80000.qcom,vcap", OFF),
	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdfac000.qti,vcap_ttl", OFF),		CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdfac000.qcom,vcap_ttl", OFF),
	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdf98000.qti,hdmi_rx", OFF),		CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdf98000.qcom,hdmi_rx", OFF),
	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdfa8000.qti,vcap_comp", OFF),		CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdfa8000.qcom,vcap_comp", OFF),
	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdfa0000.qti,vcap_sdvd", OFF),		CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "fdfa0000.qcom,vcap_sdvd", OFF),
	CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "qti,vcap_aafe.0", OFF),		CLK_DUMMY("iface_clk", vcap_ahb_clk.c, "qcom,vcap_aafe.0", OFF),
	CLK_DUMMY("bus_clk", vcap_axi_clk.c, "fdf80000.qti,vcap", OFF),		CLK_DUMMY("bus_clk", vcap_axi_clk.c, "fdf80000.qcom,vcap", OFF),
	CLK_DUMMY("bus_clk", vcap_axi_clk.c, "fdfa0000.qti,vcap_sdvd", OFF),		CLK_DUMMY("bus_clk", vcap_axi_clk.c, "fdfa0000.qcom,vcap_sdvd", OFF),
	CLK_DUMMY("audio_clk", vcap_audio_clk.c, "fdf98000.qti,hdmi_rx", OFF),		CLK_DUMMY("audio_clk", vcap_audio_clk.c, "fdf98000.qcom,hdmi_rx", OFF),
	CLK_DUMMY("cfg_clk", vcap_cfg_clk.c, "fdf98000.qti,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.qti,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,		CLK_DUMMY("pixel_clk", vcap_hdmi_rx_clk.c,
	"fdf98000.qti,hdmi_rx", OFF),		"fdf98000.qcom,hdmi_rx", OFF),
	CLK_DUMMY("md_clk", vcap_md_clk.c, "fdf98000.qti,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.qti,vcap_ttl", OFF),		CLK_DUMMY("bus_clk", vcap_ttl_clk.c, "fdfac000.qcom,vcap_ttl", OFF),
	CLK_DUMMY("debug_clk", vcap_ttl_debug_clk.c,		CLK_DUMMY("debug_clk", vcap_ttl_debug_clk.c,
	"fdfac000.qti,vcap_ttl", OFF),		"fdfac000.qcom,vcap_ttl", OFF),
	CLK_DUMMY("ext_clk", vcap_vafe_ext_clk.c,		CLK_DUMMY("ext_clk", vcap_vafe_ext_clk.c,
	"fdfa0000.qti,vcap_sdvd", OFF),		"fdfa0000.qcom,vcap_sdvd", OFF),
	CLK_DUMMY("ext_clk", vcap_vafe_ext_clk.c, "qti,vcap_aafe.0", OFF),		CLK_DUMMY("ext_clk", vcap_vafe_ext_clk.c, "qcom,vcap_aafe.0", OFF),
	CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdf80000.qti,vcap", OFF),		CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdf80000.qcom,vcap", OFF),
	CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdfac000.qti,vcap_ttl", OFF),		CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdfac000.qcom,vcap_ttl", OFF),
	CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdf98000.qti,hdmi_rx", OFF),		CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdf98000.qcom,hdmi_rx", OFF),
	CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdfa8000.qti,vcap_comp", OFF),		CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdfa8000.qcom,vcap_comp", OFF),
	CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdfa0000.qti,vcap_sdvd", OFF),		CLK_DUMMY("core_clk", vcap_vp_clk.c, "fdfa0000.qcom,vcap_sdvd", OFF),
	CLK_DUMMY("core_clk", vcap_vp_clk.c, "qti,vcap_aafe.0", OFF),		CLK_DUMMY("core_clk", vcap_vp_clk.c, "qcom,vcap_aafe.0", OFF),
	CLK_DUMMY("", venus0_vcodec0_clk.c, "", OFF),		CLK_DUMMY("", venus0_vcodec0_clk.c, "", OFF),
	CLK_DUMMY("iface_clk", venus0_ahb_clk.c, "fdce0000.qcom,venus", 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),		CLK_DUMMY("bus_clk", venus0_axi_clk.c, "fdce0000.qcom,venus", OFF),
	@@ -6767,22 +6767,22 @@ static struct clk_lookup mpq_clocks_8092[] = {
	CLK_LOOKUP("core_clk", oxili_gfx3d_clk.c, "fdb00000.qcom,kgsl-3d0"),		CLK_LOOKUP("core_clk", oxili_gfx3d_clk.c, "fdb00000.qcom,kgsl-3d0"),
	CLK_LOOKUP("iface_clk", oxilicx_ahb_clk.c, "fdb00000.qcom,kgsl-3d0"),		CLK_LOOKUP("iface_clk", oxilicx_ahb_clk.c, "fdb00000.qcom,kgsl-3d0"),
	CLK_LOOKUP("", bcss_mmss_ifdemod_clk.c, ""),		CLK_LOOKUP("", bcss_mmss_ifdemod_clk.c, ""),
	CLK_LOOKUP("iface_clk", vcap_ahb_clk.c, "fdf80000.qti,vcap"),		CLK_LOOKUP("iface_clk", vcap_ahb_clk.c, "fdf80000.qcom,vcap"),
	CLK_LOOKUP("iface_clk", vcap_ahb_clk.c, "fdfac000.qti,vcap_ttl"),		CLK_LOOKUP("iface_clk", vcap_ahb_clk.c, "fdfac000.qcom,vcap_ttl"),