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

Commit 65ad4373 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 support for new camera eeprom on 8992"

parents 47189108 8921e614

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

+55 −2
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2014-2015, 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
@@ -260,6 +260,59 @@ 
		status = "ok";

	};



	eeprom3: qcom,eeprom@3 {

		cell-index = <0>;

		reg = <0x3>;

		qcom,eeprom-name = "dw9761b";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0xb0>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <2>;



		qcom,page0 = <0 0x0 2 0x0 1 0>;

		qcom,poll0 = <0 0x0 2 0x0 1 0>;

		qcom,mem0 = <2332 0x0400 2 0 1 0>;



		qcom,page1 = <0 0x0 2 0x0 1 0>;

		qcom,poll1 = <0 0x0 2 0x0 1 0>;

		qcom,mem1 = <3 0x0F10 2 0 1 0>;



		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		cam_vaf-supply = <&pm8994_l23>;

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

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

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

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

		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,cam-power-seq-type = "sensor_vreg", "sensor_vreg",

			"sensor_vreg", "sensor_gpio", "sensor_gpio" ,

			"sensor_clk";

		qcom,cam-power-seq-val = "cam_vdig", "cam_vana", "cam_vio",

			"sensor_gpio_reset", "sensor_gpio_standby",

			"sensor_cam_mclk";

		qcom,cam-power-seq-cfg-val = <1 1 1 1 1 24000000>;

		qcom,cam-power-seq-delay = <1 1 1 30 30 5>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk0_clk_src>,

				<&clock_mmss clk_camss_mclk0_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -267,7 +320,7 @@ 
		qcom,csiphy-sd-index = <0>;

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

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom0 &eeprom2>;

		qcom,eeprom-src = <&eeprom0 &eeprom2 &eeprom3>;

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

		qcom,led-flash-src = <&led_flash0>;

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

+55 −2
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2014-2015, 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
@@ -261,6 +261,59 @@ 
		status = "ok";

	};



	eeprom3: qcom,eeprom@3 {

		cell-index = <0>;

		reg = <0x3>;

		qcom,eeprom-name = "dw9761b";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0xb0>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <2>;



		qcom,page0 = <0 0x0 2 0x0 1 0>;

		qcom,poll0 = <0 0x0 2 0x0 1 0>;

		qcom,mem0 = <2332 0x0400 2 0 1 0>;



		qcom,page1 = <0 0x0 2 0x0 1 0>;

		qcom,poll1 = <0 0x0 2 0x0 1 0>;

		qcom,mem1 = <3 0x0F10 2 0 1 0>;



		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		cam_vaf-supply = <&pm8994_l23>;

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

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

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

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

		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,cam-power-seq-type = "sensor_vreg", "sensor_vreg",

			"sensor_vreg", "sensor_gpio", "sensor_gpio" ,

			"sensor_clk";

		qcom,cam-power-seq-val = "cam_vdig", "cam_vana", "cam_vio",

			"sensor_gpio_reset", "sensor_gpio_standby",

			"sensor_cam_mclk";

		qcom,cam-power-seq-cfg-val = <1 1 1 1 1 24000000>;

		qcom,cam-power-seq-delay = <1 1 1 30 30 5>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk0_clk_src>,

				<&clock_mmss clk_camss_mclk0_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -268,7 +321,7 @@ 
		qcom,csiphy-sd-index = <0>;

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

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom0 &eeprom2>;

		qcom,eeprom-src = <&eeprom0 &eeprom2 &eeprom3>;

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

		qcom,led-flash-src = <&led_flash0>;