From c3c7e8e07875dece75d0403bf340c9fd72fac391 Mon Sep 17 00:00:00 2001 From: Subhajeet Muhuri Date: Sat, 6 Oct 2018 18:16:32 +0530 Subject: camera: Squash reverts to make ZUK's camera working for newer CAF tags * Squash of: commit 9c909f4a62201b2ebb0ba56038d31bb85ae55d81 Author: Subhajeet Muhuri Date: Sun Oct 28 14:47:09 2018 +0100 Revert "msm: camera: Add laser LED support for depth sensor" * "Camera error: Can't connect to the camera" This reverts commit 63f5792c5c6a8de2e40a9eee1195dfa264ff9431. Signed-off-by: Davide Garberi commit f7229d06853654871e970aa7bf604b01f38c3d37 Author: Subhajeet Muhuri Date: Thu Oct 11 20:21:32 2018 +0530 Revert "msm: camera: Bypass redundant creation of video node in stereo" * Camera crashes upon launching This reverts commit f977e44aeaf5da07338a4649caa45367461226f0. Signed-off-by: Davide Garberi commit b0b964a9b6714ee4ff6af4e7f587f99921e3312a Author: YaroST12 Date: Sat Oct 6 18:36:18 2018 +0530 Revert "msm: cpp: Query buffer from buffer manager based on index" * Breaks slow motion video recording This reverts commit ddff1a93bac277b1a0ba14c601d5236c3c36365d. Signed-off-by: Davide Garberi commit 5e1c739e4622428fa0b8fd9350946c31d2424b8e Author: Davide Garberi Date: Sun Oct 28 14:32:43 2018 +0100 Revert "msm: camera: Framedrop notification" This reverts commit 5925180360bca209c21e9271e277caaca68bcad5. Signed-off-by: Davide Garberi commit 0ef5dc40955cd7946f0a851feda516c34dc40d6d Author: YaroST12 Date: Sat Oct 6 18:31:20 2018 +0530 Revert "msm: camera: sensor: Adapting sensor driver to soc layer" * Kernel panics at boot This reverts commit 6b99b4c9a1706f8f7f1745af97e0f4bddecf168b. Signed-off-by: Davide Garberi commit 1da8c59614f005d524455147fd78fc5f32cfa33b Author: Subhajeet Muhuri Date: Fri Oct 5 12:24:29 2018 +0530 Revert "msm: camera: sensor: Updating soc layer clock API for i2c drivers" * Required for the proper revert of 6b99b4c This reverts commit a4663702036e6b0ae9b82691027d9913d65d7a02. Signed-off-by: Davide Garberi commit 1b138397ea01ae70f653baf6c812fb5748b3783b Author: Subhajeet Muhuri Date: Sat Oct 6 18:19:19 2018 +0530 Revert "msm: camera: Add regulator enable and disable independent of CSID" * Required for the proper revert of 6b99b4c This reverts commit fd39134867896ec5c28ce348816e31e7785e06ba. Signed-off-by: Davide Garberi commit 12e0c65509260092e8c3f22717080427a78c9469 Author: Subhajeet Muhuri Date: Sat Oct 6 18:16:32 2018 +0530 Revert "msm: camera: Add regulator enable and disable in csiphy" * Required for the proper revert of 6b99b4c This reverts commit d3e47e331617af3c87138bd205e65c6fa1a1bca7. Signed-off-by: Davide Garberi Change-Id: Iaa6aa22bb518b930141092fab9f51567c7eae092 --- .../devicetree/bindings/media/video/msm-cci.txt | 32 ---------------------- 1 file changed, 32 deletions(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/media/video/msm-cci.txt b/Documentation/devicetree/bindings/media/video/msm-cci.txt index c5c82a89f662..bb413af4b54d 100644 --- a/Documentation/devicetree/bindings/media/video/msm-cci.txt +++ b/Documentation/devicetree/bindings/media/video/msm-cci.txt @@ -205,31 +205,6 @@ Optional properties: (in the same order). - cam_vaf-supply : should contain regulator from which AF voltage is supplied -* Qualcomm Technologies, Inc. MSM LASER LED - -Required properties: -- cell-index : should contain unique identifier to differentiate - between multiple laser led modules -- reg : should contain i2c slave address of the laser led and length of - data field which is 0x0 -- compatible : - - "qcom,laser-led" -- qcom,cci-master : should contain i2c master id to be used for this camera - sensor - - 0 -> MASTER 0 - - 1 -> MASTER 1 - -Optional properties: -- qcom,cam-vreg-name : should contain names of all regulators needed by this - laser led -- qcom,cam-vreg-min-voltage : should contain minimum voltage level in microvolts - for regulators mentioned in qcom,cam-vreg-name property (in the same order) -- qcom,cam-vreg-max-voltage : should contain maximum voltage level in microvolts - for regulators mentioned in qcom,cam-vreg-name property (in the same order) -- qcom,cam-vreg-op-mode : should contain the maximum current in microamps - required from the regulators mentioned in the qcom,cam-vreg-name property - (in the same order). - * Qualcomm Technologies, Inc. MSM OIS Required properties: @@ -302,13 +277,6 @@ Example: qcom,cam-vreg-op-mode = <100000>; }; - laserled0: qcom,laserled@0 { - cell-index = <0>; - reg = <0x0>; - compatible = "qcom,laser-led"; - qcom,cci-master = <1>; - }; - qcom,camera@0 { cell-index = <0>; compatible = "qcom,camera"; -- cgit v1.2.3