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

Commit 087e16ff authored by Sridhar Gujje's avatar Sridhar Gujje Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: camera: cci: Add cci version" into camera-kernel.lnx.3.1

parents b5fcb631 5cd31588

bengal-camera.dtsi

+1 −1
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-v1.2", "qcom,cci";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x05C1B000 0x1000>;

bindings/msm-cam-cci.txt

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ First Level Node - CCI device 
  Usage: required

  Value type: <string>

  Definition: Should be "qcom,cci".

        In case of cci version 1.2,

        use "qcom,cci-v1.2".



- cell-index: cci hardware core index

  Usage: required