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

Commit b5cadeba authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: camera: remove cphy clock entry from tfe csid" into camera-kernel.lnx.4.0

parents df63ad04 a7503b7e

bengal-camera.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -616,9 +616,9 @@ 
			<&gcc GCC_CAMSS_TFE_0_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_0_CLK>;

		clock-rates =

			<240000000 0 240000000 0 256000000 0>,

			<384000000 0 341333333 0 460800000 0>,

			<426400000 0 384000000 0 576000000 0>;

			<240000000 0 0 0 256000000 0>,

			<384000000 0 0 0 460800000 0>,

			<426400000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";
@@ -681,9 +681,9 @@ 
			<&gcc GCC_CAMSS_TFE_1_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_1_CLK>;

		clock-rates =

			<240000000 0 240000000 0 256000000 0>,

			<384000000 0 341333333 0 460800000 0>,

			<426400000 0 384000000 0 576000000 0>;

			<240000000 0 0 0 256000000 0>,

			<384000000 0 0 0 460800000 0>,

			<426400000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";
@@ -746,9 +746,9 @@ 
			<&gcc GCC_CAMSS_TFE_2_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_2_CLK>;

		clock-rates =

			<240000000 0 240000000 0 256000000 0>,

			<384000000 0 341333333 0 460800000 0>,

			<426400000 0 384000000 0 576000000 0>;

			<240000000 0 0 0 256000000 0>,

			<384000000 0 0 0 460800000 0>,

			<426400000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";

holi-camera.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -731,9 +731,9 @@ 
			<&gcc GCC_CAMSS_TFE_0_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_0_CLK>;

		clock-rates =

			<300000000 0 240000000 0 300000000 0>,

			<426400000 0 341333333 0 460800000 0>,

			<466500000 0 384000000 0 576000000 0>;

			<300000000 0 0 0 300000000 0>,

			<426400000 0 0 0 460800000 0>,

			<466500000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";
@@ -795,9 +795,9 @@ 
			<&gcc GCC_CAMSS_TFE_1_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_1_CLK>;

		clock-rates =

			<300000000 0 240000000 0 300000000 0>,

			<426400000 0 341333333 0 460800000 0>,

			<466500000 0 384000000 0 576000000 0>;

			<300000000 0 0 0 300000000 0>,

			<426400000 0 0 0 460800000 0>,

			<466500000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";
@@ -859,9 +859,9 @@ 
			<&gcc GCC_CAMSS_TFE_2_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_2_CLK>;

		clock-rates =

			<300000000 0 240000000 0 300000000 0>,

			<426400000 0 341333333 0 460800000 0>,

			<466500000 0 384000000 0 576000000 0>;

			<300000000 0 0 0 300000000 0>,

			<426400000 0 0 0 460800000 0>,

			<466500000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";

scuba-camera.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -564,9 +564,9 @@ 
			<&gcc GCC_CAMSS_TFE_0_CLK_SRC>,

			<&gcc GCC_CAMSS_TFE_0_CLK>;

		clock-rates =

			<240000000 0 240000000 0 256000000 0>,

			<384000000 0 341333333 0 460800000 0>,

			<426400000 0 384000000 0 576000000 0>;

			<240000000 0 0 0 256000000 0>,

			<384000000 0 0 0 460800000 0>,

			<426400000 0 0 0 576000000 0>;

		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";