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

Commit 6bf4cf1b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UPSTREAM: PC27_PC28: Merge commit... 

Merge "UPSTREAM: PC27_PC28: Merge commit '2312efe8' into msm-4.9 - mainline -11/13"
parents 75296893 de12ffbc

Documentation/devicetree/bindings/media/video/msm-cam-cci.txt

+24 −0
Original line number Diff line number Diff line
@@ -54,6 +54,21 @@ Optional properties: 
- hw-trdhld : should contain internal hold time for SDA

- hw-tsp : should contain filtering of glitches



* Qualcomm Technologies, Inc. MSM Camera Sensor Resource Manager



MSM camera sensor resource manager node contains properties of shared camera

sensor resource.



Required properties:

- compatible : should be manufacturer name followed by sensor name

  - "qcom,cam-res-mgr"

Optional properties:

- shared-gpios : should contain the gpios which are used by two or more

  cameras, and these cameras may be opened together.

- pinctrl-names: List of names to assign the shared pin state defined in pinctrl device node

- pinctrl-<0..n>: Lists phandles each pointing to the pin configuration node within a pin

  controller. These pin configurations are installed in the pinctrl device node.



* Qualcomm Technologies, Inc. MSM Sensor



MSM sensor node contains properties of camera sensor
@@ -334,6 +349,15 @@ qcom,cci@0xfda0c000 { 
         rgltr-load-current = <100000>;

    };



    qcom,cam-res-mgr {

         compatible = "qcom,cam-res-mgr";

         status = "ok";

         shared-gpios = <18 19>;

         pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";

         pinctrl-0 = <&cam_res_mgr_active>;

         pinctrl-1 = <&cam_res_mgr_suspend>;

    };



    qcom,cam-sensor@0 {

         cell-index = <0>;

         compatible = "qcom,camera";

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

+5 −0
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ 
};



&cam_cci {

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

	};



	actuator_rear: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

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

+5 −0
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ 
};



&cam_cci {

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

	};



	actuator_rear: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

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

+5 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ 
};



&cam_cci {

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

	};



	actuator_rear: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

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

+5 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ 
};



&cam_cci {

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

	};



	actuator_rear: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;