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

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

Merge "ARM: dts: msm: Add clock properties to GDSC on MSMtitanium"

parents 7ad5be5e 1bcdafa8

arch/arm/boot/dts/qcom/msmtitanium.dtsi

+35 −1
Original line number Diff line number Diff line
@@ -1234,39 +1234,73 @@ 
#include "msm-gdsc-8916.dtsi"



&gdsc_venus {

	clock-names = "bus_clk", "core_clk";

	clocks = <&clock_gcc clk_gcc_venus0_axi_clk>,

		 <&clock_gcc clk_gcc_venus0_vcodec0_clk>;

	status = "okay";

};



&gdsc_venus_core0 {

	qcom,support-hw-trigger;

	clock-names ="core0_clk";

	clocks = <&clock_gcc clk_gcc_venus0_core0_vcodec0_clk>;

	status = "okay";

};



&gdsc_mdss {

	clock-names = "core_clk", "bus_clk";

	clocks = <&clock_gcc clk_gcc_mdss_mdp_clk>,

		 <&clock_gcc clk_gcc_mdss_axi_clk>;

	proxy-supply = <&gdsc_mdss>;

	qcom,proxy-consumer-enable;

	status = "okay";

};



&gdsc_oxili_gx {

	status = "okay";

	clock-names = "core_root_clk";

	clocks =<&clock_gcc_gfx clk_gfx3d_clk_src>;

	qcom,force-enable-root-clk;

	parent-supply = <&gfx_vreg_corner>;

	status = "okay";

};



&gdsc_jpeg {

	clock-names = "core_clk", "bus_clk";

	clocks = <&clock_gcc clk_gcc_camss_jpeg0_clk>,

		 <&clock_gcc clk_gcc_camss_jpeg_axi_clk>;

	status = "okay";

};



&gdsc_vfe {

	clock-names = "core_clk", "bus_clk", "micro_clk",

			"csi_clk";

	clocks = <&clock_gcc clk_gcc_camss_vfe0_clk>,

		 <&clock_gcc clk_gcc_camss_vfe_axi_clk>,

		 <&clock_gcc clk_gcc_camss_micro_ahb_clk>,

		 <&clock_gcc clk_gcc_camss_csi_vfe0_clk>;

	status = "okay";

};



&gdsc_vfe1 {

	clock-names = "core_clk", "bus_clk", "micro_clk",

			"csi_clk";

	clocks = <&clock_gcc clk_gcc_camss_vfe1_clk>,

		 <&clock_gcc clk_gcc_camss_vfe1_axi_clk>,

		 <&clock_gcc clk_gcc_camss_micro_ahb_clk>,

		 <&clock_gcc clk_gcc_camss_csi_vfe1_clk>;

	status = "okay";

};



&gdsc_cpp {

	clock-names = "core_clk", "bus_clk";

	clocks = <&clock_gcc clk_gcc_camss_cpp_clk>,

		 <&clock_gcc clk_gcc_camss_cpp_axi_clk>;

	status = "okay";

};



&gdsc_oxili_cx {

	clock-names = "core_clk";

	clocks = <&clock_gcc_gfx clk_gcc_oxili_gfx3d_clk>;

	status = "okay";

};

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

+1 −1
Original line number Diff line number Diff line
@@ -3281,7 +3281,7 @@ static struct mux_clk gcc_debug_mux = { 
		{ &snoc_clk.c, 0x0000 },

		{ &sysmmnoc_clk.c, 0x0001 },

		{ &pcnoc_clk.c, 0x0008 },

		{ &bimc_clk.c, 0x154 },

		{ &bimc_clk.c, 0x15A },

		{ &gcc_dcc_clk.c, 0x000d },

		{ &gcc_pcnoc_usb3_axi_clk.c, 0x000e },

		{ &gcc_gp1_clk.c, 0x0010 },