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

Commit 5fe9ef5e authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove lowsvs clk rates for ipe, bps for sdm845, sdm670"... 

Merge "ARM: dts: msm: Remove lowsvs clk rates for ipe, bps for sdm845, sdm670" into dev/msm-4.9-camx
parents 5a7e3240 cc4f59c7

arch/arm64/boot/dts/qcom/sdm670-camera.dtsi

+7 −7
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -913,12 +913,12 @@ 
				<&clock_camcc CAM_CC_IPE_0_CLK>,

				<&clock_camcc CAM_CC_IPE_0_CLK_SRC>;



		clock-rates = <0 0 0 0 240000000>,

		clock-rates =

			<0 0 0 0 404000000>,

			<0 0 0 0 480000000>,

			<0 0 0 0 538000000>,

			<0 0 0 0 600000000>;

		clock-cntl-level = "lowsvs", "svs",

		clock-cntl-level = "svs",

			"svs_l1", "nominal", "turbo";

		status = "ok";

	};
@@ -940,12 +940,12 @@ 
				<&clock_camcc CAM_CC_IPE_1_CLK>,

				<&clock_camcc CAM_CC_IPE_1_CLK_SRC>;



		clock-rates = <0 0 0 0 240000000>,

		clock-rates =

			<0 0 0 0 404000000>,

			<0 0 0 0 480000000>,

			<0 0 0 0 538000000>,

			<0 0 0 0 600000000>;

		clock-cntl-level = "lowsvs", "svs",

		clock-cntl-level = "svs",

			"svs_l1", "nominal", "turbo";

		status = "ok";

	};
@@ -967,12 +967,12 @@ 
				<&clock_camcc CAM_CC_BPS_CLK>,

				<&clock_camcc CAM_CC_BPS_CLK_SRC>;



		clock-rates = <0 0 0 0 200000000>,

		clock-rates =

			<0 0 0 0 404000000>,

			<0 0 0 0 480000000>,

			<0 0 0 0 600000000>,

			<0 0 0 0 600000000>;

		clock-cntl-level = "lowsvs", "svs",

		clock-cntl-level = "svs",

			"svs_l1", "nominal", "turbo";

		status = "ok";

	};

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+6 −7
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -885,12 +885,11 @@ 
				<&clock_camcc CAM_CC_IPE_0_CLK_SRC>;



		clock-rates =

			<0 0 0 0 240000000>,

			<0 0 0 0 404000000>,

			<0 0 0 0 480000000>,

			<0 0 0 0 538000000>,

			<0 0 0 0 600000000>;

		clock-cntl-level = "lowsvs", "svs",

		clock-cntl-level = "svs",

			"svs_l1", "nominal", "turbo";

		status = "ok";

	};
@@ -912,12 +911,12 @@ 
				<&clock_camcc CAM_CC_IPE_1_CLK>,

				<&clock_camcc CAM_CC_IPE_1_CLK_SRC>;



		clock-rates = <0 0 0 0 240000000>,

		clock-rates =

			<0 0 0 0 404000000>,

			<0 0 0 0 480000000>,

			<0 0 0 0 538000000>,

			<0 0 0 0 600000000>;

		clock-cntl-level = "lowsvs", "svs",

		clock-cntl-level = "svs",

			"svs_l1", "nominal", "turbo";

		status = "ok";

	};
@@ -939,12 +938,12 @@ 
				<&clock_camcc CAM_CC_BPS_CLK>,

				<&clock_camcc CAM_CC_BPS_CLK_SRC>;



		clock-rates = <0 0 0 0 200000000>,

		clock-rates =

			<0 0 0 0 404000000>,

			<0 0 0 0 480000000>,

			<0 0 0 0 600000000>,

			<0 0 0 0 600000000>;

		clock-cntl-level = "lowsvs", "svs",

		clock-cntl-level = "svs",

			"svs_l1", "nominal", "turbo";

		status = "ok";

	};