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

Commit fa78bf57 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: add camera dtsi files for APQ8084"

parents 3ae5c8c1 76e1a339

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

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ Required properties: 
    qcom,gpio-req-tbl-num property (in the same order)

- qcom,gpio-req-tbl-label : should contain name of gpios present in

    qcom,gpio-req-tbl-num property (in the same order)

- clock-names: name of the clocks required for the device

- clock-rates: clock rate in Hz



Optional properties:

- master0: qcom,cci-master0 - node should contain clock settings for
@@ -177,6 +179,10 @@ Example: 
       reg-names = "cci";

       interrupts = <0 50 0>;

       interrupt-names = "cci";

	qcom,clock-names = "camss_top_ahb_clk", "vfe_clk_src",

			"camss_vfe_vfe_clk", "iface_clk", "cpp_core_clk",

			"cpp_iface_clk", "cpp_bus_clk", "micro_iface_clk";

	qcom,clock-rates = <0 266670000 0 0 266670000 0 0 0>;

       gpios = <&msmgpio 19 0>,

               <&msmgpio 20 0>,

               <&msmgpio 21 0>,

Documentation/devicetree/bindings/media/video/msm-cpp.txt

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ Required properties: 
- interrupt-names : should specify relevant names to each interrupts

  property defined.

- vdd-supply: phandle to GDSC regulator controlling VFE & CPP core.

- clock-names: name of the clocks required for the device

- clock-rates: clock rate in Hz



Example:
@@ -27,4 +29,8 @@ Example: 
       interrupts = <0 49 0>;

       interrupt-names = "cpp";

       vdd-supply = <&gdsc_vfe>;

	qcom,clock-names = "camss_top_ahb_clk", "vfe_clk_src",

			"camss_vfe_vfe_clk", "iface_clk", "cpp_core_clk",

			"cpp_iface_clk", "cpp_bus_clk", "micro_iface_clk";

	qcom,clock-rates = <0 266670000 0 0 266670000 0 0 0>;

   };

Documentation/devicetree/bindings/media/video/msm-vfe.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
- compatible :

    - "qcom,vfe"

    - "qcom,vfe40"

    - "qcom,vfe44"

- reg : offset and length of the register set for the device

    for the vfe operating in compatible mode.

- reg-names : should specify relevant names to each reg property defined.

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

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

 * Copyright (c) 2013, 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@36 {

		cell-index = <1>;

		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

		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>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

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

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

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

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,

			<&msmgpio 35 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_MCLK",

					  "CAM_RESET1",

					  "CAM_STANDBY";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 30000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@6d {

		compatible = "qcom,imx132";

		reg = <0x6d>;

		qcom,slave-id = <0x6c 0x0 0x0132>;

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

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

		qcom,mount-angle = <270>;

		qcom,sensor-name = "imx132";

        cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

		qcom,cam-vreg-min-voltage = <2850000 1225000 0>;

		qcom,cam-vreg-max-voltage = <2850000 1225000 0>;

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

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

		gpios = <&msmgpio 17 0>,

			    <&msmgpio 25 0>;

		qcom,gpio-reset = <1>;

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

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

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

					  "CAM_XSHUTDOWN";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 4000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};

};

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

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

 * Copyright (c) 2013, 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@36 {

		cell-index = <1>;

		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

		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>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

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

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

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

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,

			<&msmgpio 35 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_MCLK",

					  "CAM_RESET1",

					  "CAM_STANDBY";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 30000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@6d {

		compatible = "qcom,imx132";

		reg = <0x6d>;

		qcom,slave-id = <0x6c 0x0 0x0132>;

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

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

		qcom,mount-angle = <270>;

		qcom,sensor-name = "imx132";

        cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

		qcom,cam-vreg-min-voltage = <2850000 1225000 0>;

		qcom,cam-vreg-max-voltage = <2850000 1225000 0>;

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

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

		gpios = <&msmgpio 17 0>,

			    <&msmgpio 25 0>;

		qcom,gpio-reset = <1>;

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

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

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

					  "CAM_XSHUTDOWN";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 4000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};

};