Merge "ARM: dts: msm: Add device tree for QRD msm8916 camera"

/*

 * 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@6e {

		cell-index = <3>;

		reg = <0x18>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

	};

	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

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

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

		qcom,actuator-src = <&actuator0>;

		cam_vaf-supply = <&pm8916_l10>;

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default &cam_sensor_rear_default>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep &cam_sensor_rear_sleep>;

		gpios = <&msm_gpio 26 0>,

				<&msm_gpio 35 0>,

				<&msm_gpio 34 0>,

				<&msm_gpio 114 0>,

				<&msm_gpio 110 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-vdig = <3>;

		qcom,gpio-vana = <4>;

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

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

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

				"CAM_RESET1",

				"CAM_STANDBY",

				"CAM_VDIG",

				"CAM_VANA";

		qcom,cci-master = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

	};

	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

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

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

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_default &cam_sensor_front_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep &cam_sensor_front_sleep>;

		gpios = <&msm_gpio 27 0>,

				<&msm_gpio 28 0>,

				<&msm_gpio 33 0>,

				<&msm_gpio 114 0>,

				<&msm_gpio 110 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-vdig = <3>;

		qcom,gpio-vana = <4>;

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

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

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

				"CAM_RESET",

				"CAM_STANDBY",

				"CAM_VDIG",

				"CAM_VANA";

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";

	};

};

#include "msm8916-qrd.dtsi"

#include "dsi-panel-innolux-720p-video.dtsi"

#include "msm8916-camera-sensor-qrd.dtsi"

&tlmm_pinmux {

	akm_reset_pin {