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

Commit d3904af2 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: msm: camera device tree changes for 8994"

parents 6d2e7d07 39229431

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

0 → 100644
+146 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&cci {

	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

		qcom,cam-vreg-min-voltage = <2800000>;

		qcom,cam-vreg-max-voltage = <2800000>;

		qcom,cam-vreg-op-mode = <100000>;

	};



	actuator1: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

		qcom,cam-vreg-min-voltage = <2800000>;

		qcom,cam-vreg-max-voltage = <2800000>;

		qcom,cam-vreg-op-mode = <100000>;

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

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

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

		qcom,mount-angle = <90>;

		qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_rear_suspend>;

		gpios = <&msm_gpio 13 0>,

			<&msm_gpio 92 0>,

			<&msm_gpio 91 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

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

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

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1200000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_active &cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_rear2_suspend>;

		gpios = <&msm_gpio 14 0>,

			<&msm_gpio 94 0>,

			<&msm_gpio 93 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",

					  "CAM_RESET1",

					  "CAM_STANDBY1";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x02>;

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

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

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_front_suspend>;

		gpios = <&msm_gpio 15 0>,

			<&msm_gpio 104 0>,

			<&msm_gpio 105 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};

};

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

0 → 100644
+148 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&cci {

	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

		qcom,cam-vreg-min-voltage = <2800000>;

		qcom,cam-vreg-max-voltage = <2800000>;

		qcom,cam-vreg-op-mode = <100000>;

		status = "disabled";

	};



	actuator1: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

		qcom,cam-vreg-min-voltage = <2800000>;

		qcom,cam-vreg-max-voltage = <2800000>;

		qcom,cam-vreg-op-mode = <100000>;

		status = "disabled";

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

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

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

		qcom,mount-angle = <90>;

		qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_rear_suspend>;

		gpios = <&msm_gpio 13 0>,

			<&msm_gpio 92 0>,

			<&msm_gpio 91 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

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

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

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1200000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_active &cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend &cam_sensor_rear2_suspend>;

		gpios = <&msm_gpio 14 0>,

			<&msm_gpio 94 0>,

			<&msm_gpio 93 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",

					  "CAM_RESET1",

					  "CAM_STANDBY1";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x02>;

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

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

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_front_suspend>;

		gpios = <&msm_gpio 15 0>,

			<&msm_gpio 104 0>,

			<&msm_gpio 105 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

	};

};

arch/arm/boot/dts/qcom/msm8994-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include "msm8994-pinctrl.dtsi"

#include "msm8994-camera-sensor-cdp.dtsi"



&sdhc_1 {

	vdd-supply = <&pm8994_l20>;

arch/arm/boot/dts/qcom/msm8994-mtp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include "msm8994-pinctrl.dtsi"

#include "msm8994-camera-sensor-cdp.dtsi"



&sdhc_1 {

	vdd-supply = <&pm8994_l20>;

arch/arm/boot/dts/qcom/msm8994-pinctrl.dtsi

+202 −0
Original line number Diff line number Diff line
@@ -651,5 +651,207 @@ 
				bias-disable;

			};

		};



		cci0_active {

			/* CLK, DATA */

			qcom,pins = <&gp 17>, <&gp 18>;

			qcom,num-grp-pins = <2>;

			qcom,pin-func = <1>;

			label = "cci0-active";

			/* active state */

			cci0_active: cci0_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cci0_suspend {

			/* CLK, DATA */

			qcom,pins = <&gp 17>, <&gp 18>;

			qcom,num-grp-pins = <2>;

			qcom,pin-func = <0>;

			label = "cci0-suspend";

			/*suspended state */

			cci0_suspend: cci0_suspend {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cci1_active {

			/* CLK, DATA */

			qcom,pins = <&gp 19>, <&gp 20>;

			qcom,num-grp-pins = <2>;

			qcom,pin-func = <1>;

			label = "cci1-active";

			/* active state */

			cci1_active: cci1_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cci1_suspend {

			/* CLK, DATA */

			qcom,pins = <&gp 19>, <&gp 20>;

			qcom,num-grp-pins = <2>;

			qcom,pin-func = <0>;

			label = "cci1-suspend";

			/*suspended state */

			cci1_suspend: cci1_suspend {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_mclk0_active {

			/* MCLK0 */

			qcom,pins = <&gp 13>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <1>;

			label = "cam_sensor_mclk0_active";

			/* active state */

			cam_sensor_mclk0_active: cam_sensor_mclk0_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_mclk0_suspend {

			/* MCLK0 */

			qcom,pins = <&gp 13>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <1>;

			label = "cam_sensor_mclk0_suspend";

			/*suspended state */

			cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend {

				drive-strength = <2>; /* 2 MA */

				bias-pull-down; /* PULL DOWN */

			};

		};



		cam_sensor_rear_active {

			/* RESET, STANDBY */

			qcom,pins = <&gp 92>, <&gp 91>;

			qcom,num-grp-pins = <2>;

			label = "cam_sensor_rear_active";

			/* active state */

			cam_sensor_rear_active: cam_sensor_rear_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_rear_suspend {

			/* RESET, STANDBY */

			qcom,pins = <&gp 92>, <&gp 91>;

			qcom,num-grp-pins = <2>;

			label = "cam_sensor_rear_suspend";

			/*suspended state */

			cam_sensor_rear_suspend: cam_sensor_rear_suspend {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_mclk1_active {

			/* MCLK2 */

			qcom,pins = <&gp 14>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <1>;

			label = "cam_sensor_mclk1_active";

			/* active state */

			cam_sensor_mclk1_active: cam_sensor_mclk1_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_mclk1_suspend {

			/* MCLK2 */

			qcom,pins = <&gp 14>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <1>;

			label = "cam_sensor_mclk1_suspend";

			/* suspend state */

			cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend {

				drive-strength = <2>; /* 2 MA */

				bias-pull-down; /* PULL DOWN */

			};

		};



		cam_sensor_rear2_active {

			/* RESET, STANDBY */

			qcom,pins = <&gp 94>, <&gp 93>;

			qcom,num-grp-pins = <2>;

			label = "cam_sensor_rear2_active";

			/* active state */

			cam_sensor_rear2_active: cam_sensor_rear2_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_rear2_suspend {

			/* RESET, STANDBY */

			qcom,pins = <&gp 94>, <&gp 93>;

			qcom,num-grp-pins = <2>;

			label = "cam_sensor_rear2_suspend";

			/*suspended state */

			cam_sensor_rear2_suspend: cam_sensor_rear2_suspend {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_mclk2_active {

			/* MCLK2 */

			qcom,pins = <&gp 15>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <1>;

			label = "cam_sensor_mclk2_active";

			/* active state */

			cam_sensor_mclk2_active: cam_sensor_mclk2_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_mclk2_suspend {

			/* MCLK2 */

			qcom,pins = <&gp 15>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <1>;

			label = "cam_sensor_mclk2_suspend";

			/* suspend state */

			cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend {

				drive-strength = <2>; /* 2 MA */

				bias-pull-down; /* PULL DOWN */

			};

		};



		cam_sensor_front_active {

			/* RESET, STANDBY */

			qcom,pins = <&gp 104>, <&gp 105>;

			qcom,num-grp-pins = <2>;

			label = "cam_sensor_front_active";

			/* active state */

			cam_sensor_front_active: cam_sensor_front_active {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};



		cam_sensor_front_suspend {

			/* RESET, STANDBY */

			qcom,pins = <&gp 104>, <&gp 105>;

			qcom,num-grp-pins = <2>;

			label = "cam_sensor_front_suspend";

			/*suspended state */

			cam_sensor_front_suspend: cam_sensor_front_suspend {

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

			};

		};

	};

};