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

Commit dfc2f729 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: Change csi clock voting from ispif node"

parents 644d9e31 a39d8838

arch/arm/boot/dts/qcom/msm8952-camera.dtsi

+11 −7
Original line number Diff line number Diff line
@@ -182,16 +182,20 @@ 
			"vfe0_clk_src", "camss_vfe_vfe0_clk", "camss_csi_vfe0_clk",

			"vfe1_clk_src", "camss_vfe_vfe1_clk", "camss_csi_vfe1_clk";

		qcom,clock-rates = <61540000

			200000000 0 0 0

			200000000 0 0 0

			200000000 0 0 0

			0 0 0 0

			0 0 0 0

			0 0 0 0

			0 0 0

			0 0 0>;

		qcom,clock-control = "SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE", "NO_SET_RATE", "NO_SET_RATE";

	};

arch/arm/boot/dts/qcom/msm8996-camera.dtsi

+12 −8
Original line number Diff line number Diff line
@@ -256,18 +256,22 @@ 
			"vfe0_clk_src", "camss_vfe_vfe0_clk", "camss_csi_vfe0_clk",

			"vfe1_clk_src", "camss_vfe_vfe1_clk", "camss_csi_vfe1_clk";

		qcom,clock-rates = <0 0 0 0

			200000000 0 0 0

			200000000 0 0 0

			200000000 0 0 0

			200000000 0 0 0

			0 0 0 0

			0 0 0 0

			0 0 0 0

			0 0 0 0

			0 0 0

			0 0 0>;

		qcom,clock-control = "NO_SET_RATE", "NO_SET_RATE",

			"NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"SET_RATE", "NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE",

			"NO_SET_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE", "NO_SET_RATE", "NO_SET_RATE",

			"INIT_RATE", "NO_SET_RATE", "NO_SET_RATE";

		status = "ok";