Merge "ARM: dts: msm: Add camera dtsi for qcs610" into camera-kernel.lnx.4.0

&soc {

	camera_ldo: gpio-regulator@0 {

		compatible = "regulator-fixed";

		reg = <0x00 0x00>;

		regulator-name = "camera_ldo";

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

		regulator-enable-ramp-delay = <135>;

		enable-active-high;

		gpio = <&pm6150l_gpios 3 0>;

		pinctrl-names = "default";

		pinctrl-0 = <&cam_sensor_dvdd_en>;

		vin-supply = <&pm6150l_s8>;

	};

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

	};

};

&cam_cci {

	qcom,cam-sensor@0 {

		cell-index = <0>;

		compatible = "qcom,cam-sensor";

		reg = <0x0>;

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&pm6150l_l4>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2850000 1200000 0>;

		rgltr-max-voltage = <1800000 2850000 1200000 0>;

		rgltr-load-current = <0 80000 105000 0>;

		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 = <&tlmm 28 0>,

			<&tlmm 47 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <37125000>;

	};

};