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

Commit 3365d237 authored by Haritha Chintalapati's avatar Haritha Chintalapati Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add dualife as a client of CPAS-CDM for Kona and... 

Merge "ARM: dts: msm: Add dualife as a client of CPAS-CDM for Kona and Lahaina" into camera-kernel.lnx.4.0
parents ee8bfb76 40b5c64d

kona-camera.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ 
			<&clock_camcc CAM_CC_CPAS_AHB_CLK>;

		clock-rates = <0 0>;

		clock-cntl-level = "svs";

		cdm-client-names = "ife2", "ife3", "ife4", "ife5", "ife6";

		cdm-client-names = "ife2", "ife3", "ife4", "ife5", "ife6", "dualife";

		status = "ok";

	};

lahaina-camera.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ 
			<&clock_camcc CAM_CC_CPAS_AHB_CLK>;

		clock-rates = <0 0>;

		clock-cntl-level = "svs";

		cdm-client-names = "ife3", "ife4";

		cdm-client-names = "ife3", "ife4", "dualife";

		status = "ok";

	};