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

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

Merge "ARM: dts: add autofocus support for target 8084"

parents ddc46d3a 99d539e9

arch/arm/boot/dts/qcom/apq8084-camera-sensor-cdp.dtsi

+10 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013 - 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -13,6 +13,13 @@ 


&cci {



	actuator0: qcom,actuator@36 {

		cell-index = <0>;

		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;
@@ -21,6 +28,7 @@ 
		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

                qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;
@@ -95,6 +103,7 @@ 
		reg = <0x00>;

		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

                qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

arch/arm/boot/dts/qcom/apq8084-camera-sensor-liquid.dtsi

+9 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013 - 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -12,6 +12,12 @@ 
 */



&cci {

	actuator0: qcom,actuator@36 {

		cell-index = <0>;

		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";
@@ -21,6 +27,7 @@ 
		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <0>;

		qcom,sensor-name = "imx135";

                qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;
@@ -96,6 +103,7 @@ 
		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

                qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

arch/arm/boot/dts/qcom/apq8084-camera-sensor-mtp.dtsi

+9 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013 - 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -12,6 +12,12 @@ 
 */



&cci {

	actuator0: qcom,actuator@36 {

		cell-index = <0>;

		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";
@@ -21,6 +27,7 @@ 
		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

                qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;
@@ -96,6 +103,7 @@ 
		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

                qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

arch/arm/boot/dts/qcom/apq8084-camera-sensor-sbc.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
&cci {



	actuator0: qcom,actuator@36 {

		cell-index = <1>;

		cell-index = <0>;

		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;