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

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

Merge "ARM: dts: msm: Add simple-bus compat string in camera for all archs"... 

Merge "ARM: dts: msm: Add simple-bus compat string in camera for all archs" into camera-kernel.lnx.4.0
parents ecd010ff d2167685

bengal-camera.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 


	cam_cci0: qcom,cci0 {

		cell-index = <0>;

		compatible = "qcom,cci";

		compatible = "qcom,cci", "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x05C1B000 0x1000>;
@@ -192,7 +192,7 @@ 
	};



	qcom,cam_smmu {

		compatible = "qcom,msm-cam-smmu";

		compatible = "qcom,msm-cam-smmu", "simple-bus";

		status = "ok";



		msm_cam_smmu_tfe {

kona-camera.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 


	cam_cci0: qcom,cci@ac4f000 {

		cell-index = <0>;

		compatible = "qcom,cci";

		compatible = "qcom,cci", "simple-bus";

		reg = <0xac4f000 0x1000>;

		reg-names = "cci";

		reg-cam-base = <0x4f000>;
@@ -275,7 +275,7 @@ 


	cam_cci1: qcom,cci@ac50000 {

		cell-index = <1>;

		compatible = "qcom,cci";

		compatible = "qcom,cci", "simple-bus";

		reg = <0xac50000 0x1000>;

		reg-names = "cci";

		reg-cam-base = <0x50000>;
@@ -367,7 +367,7 @@ 
	};



	qcom,cam_smmu {

		compatible = "qcom,msm-cam-smmu";

		compatible = "qcom,msm-cam-smmu", "simple-bus";

		status = "ok";



		msm_cam_smmu_ife {

lahaina-camera.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 


	cam_cci0: qcom,cci0 {

		cell-index = <0>;

		compatible = "qcom,cci";

		compatible = "qcom,cci", "simple-bus";

		reg = <0xac4f000 0x1000>;

		reg-names = "cci";

		reg-cam-base = <0x4f000>;
@@ -275,7 +275,7 @@ 


	cam_cci1: qcom,cci1 {

		cell-index = <1>;

		compatible = "qcom,cci";

		compatible = "qcom,cci", "simple-bus";

		reg = <0xac50000 0x1000>;

		reg-names = "cci";

		reg-cam-base = <0x50000>;
@@ -367,7 +367,7 @@ 
	};



	qcom,cam_smmu {

		compatible = "qcom,msm-cam-smmu";

		compatible = "qcom,msm-cam-smmu", "simple-bus";

		status = "ok";



		msm_cam_smmu_ife {

lito-camera.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 


	cam_cci0: qcom,cci0 {

		cell-index = <0>;

		compatible = "qcom,cci";

		compatible = "qcom,cci", "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0xac4a000 0x1000>;
@@ -224,7 +224,7 @@ 


	cam_cci1: qcom,cci1 {

		cell-index = <1>;

		compatible = "qcom,cci";

		compatible = "qcom,cci", "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0xac4b000 0x1000>;
@@ -314,7 +314,7 @@ 
	};



	qcom,cam_smmu {

		compatible = "qcom,msm-cam-smmu";

		compatible = "qcom,msm-cam-smmu", "simple-bus";

		status = "ok";



		msm_cam_smmu_ife {