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

Commit dc5a2d4e 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 camera sensor for msm8909-pm8916"

parents 85d2fec9 7aeaa762

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

0 → 100644
+192 −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.

 */



&soc {

};



&i2c_3 {

	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x3>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8916_l10>;

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

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

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

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

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

	};



	eeprom0: qcom,eeprom@6c{

		cell-index = <0>;

		reg = <0x6c>;

		qcom,eeprom-name = "sunny_ov8858_q8v19w";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x6c>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <4>;



		qcom,page0 = <1 0x0100 2 0x01 1 1>;

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

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

		qcom,page1 = <1 0x3d84 2 0xc0 1 1>;

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

		qcom,mem1 = <0 0x3d00 2 0 1 0>;

		qcom,page2 = <1 0x3d88 2 0x7010 2 1>;

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

		qcom,mem2 = <0 0x3d00 2 0 1 0>;

		qcom,page3 = <1 0x3d8A 2 0x7184 2 1>;

		qcom,pageen3 = <1 0x3d81 2 0x01 1 10>;

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

		qcom,mem3 = <373 0x7010 2 0 1 1>;



		cam_vdig-supply = <&pm8916_12>;

		cam_vana-supply = <&pm8916_l17>;

		cam_vio-supply = <&pm8916_l6>;

		cam_vaf-supply = <&pm8916_l10>;

		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 = <1200000 0 2800000 2850000>;

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

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

		qcom,enable_pinctrl;

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

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

			"sensor_gpio", "sensor_gpio",

			"sensor_clk";

		qcom,cam-power-seq-val = "cam_vaf",

			"sensor_gpio_reset",

			"sensor_gpio_standby",

			"sensor_cam_mclk" ;

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

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

		clocks = <&clock_gcc clk_mclk0_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk0_clk>;

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

	};



	led_flash0: qcom,led-flash@60 {

		cell-index = <0>;

		reg = <0x60>;

		qcom,slave-id = <0x60 0x00 0x0011>;

		compatible = "qcom,led-flash";

		label = "adp1660";

		qcom,flash-type = <1>;

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

		qcom,enable_pinctrl;

		pinctrl-names = "cam_flash_default", "cam_flash_suspend";

		pinctrl-0 = <&cam_sensor_flash_default>;

		pinctrl-1 = <&cam_sensor_flash_sleep>;

		gpios = <&msm_gpio 31 0>,

			<&msm_gpio 32 0>;

		qcom,gpio-flash-en = <0>;

		qcom,gpio-flash-now = <1>;

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

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

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

			"FLASH_NOW";

		qcom,cci-master = <0>;

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x2>;

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

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

		qcom,mount-angle = <90>;

		qcom,actuator-src = <&actuator0>;

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

		qcom,eeprom-src = <&eeprom0>;

		cam_vdig-supply = <&pm8916_l2>;

		cam_vana-supply = <&pm8916_l17>;

		cam_vio-supply = <&pm8916_l6>;

		cam_vaf-supply = <&pm8916_l10>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <200000 0 80000 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>;

		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,sensor-position = <0>;

		qcom,sensor-mode = <0>;

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

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

		qcom,mount-angle = <90>;

		cam_vana-supply = <&pm8916_l17>;

		cam_vio-supply = <&pm8916_l6>;

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

		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_RESET",

			"CAM_STANDBY";

		qcom,cci-master = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

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

	};

};

arch/arm/boot/dts/qcom/msm8909-pm8916-camera.dtsi

0 → 100644
+144 −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.

 */



&soc {

	qcom,msm-cam@1800000{

		compatible = "qcom,msm-cam";

	};



	qcom,csiphy@1b0ac00 {

		cell-index = <0>;

		compatible = "qcom,csiphy-v3.1", "qcom,csiphy";

		reg = <0x1b0ac00 0x200>,

			<0x1b00030 0x4>;

		reg-names = "csiphy", "csiphy_clk_mux";

		interrupts = <0 78 0>;

		interrupt-names = "csiphy";

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_csi0phytimer_clk_src>,

			<&clock_gcc clk_gcc_camss_csi0phytimer_clk>,

			<&clock_gcc clk_camss_top_ahb_clk_src>,

			<&clock_gcc clk_gcc_camss_csi0phy_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>;

		clock-names = "camss_top_ahb_clk", "ispif_ahb_clk",

			"csiphy_timer_src_clk", "csiphy_timer_clk",

			"camss_ahb_src", "csi_phy_clk",

			"camss_ahb_clk";

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

	};



	qcom,csid@1b08000  {

		cell-index = <0>;

		compatible = "qcom,csid-v3.1", "qcom,csid";

		reg = <0x1b08000 0x100>;

		reg-names = "csid";

		interrupts = <0 49 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1200000>;

		qcom,mipi-csi-vdd-supply = <&pm8916_l2>;

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi0_ahb_clk>,

			<&clock_gcc clk_csi0_clk_src>,

			<&clock_gcc clk_gcc_camss_csi0_clk>,

			<&clock_gcc clk_gcc_camss_csi0pix_clk>,

			<&clock_gcc clk_gcc_camss_csi0rdi_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>;

		clock-names = "ispif_ahb_clk", "camss_top_ahb_clk",

			"csi_ahb_clk", "csi_src_clk",

			"csi_clk",  "csi_pix_clk",

			"csi_rdi_clk", "camss_ahb_clk";

		qcom,clock-rates = <40000000 0 0 200000000 0 0 0 0>;

	};



	qcom,csid@1b08400 {

		cell-index = <1>;

		compatible = "qcom,csid-v3.1", "qcom,csid";

		reg = <0x1b08400 0x100>;

		reg-names = "csid";

		interrupts = <0 50 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1200000>;

		qcom,mipi-csi-vdd-supply = <&pm8916_l2>;

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi1_ahb_clk>,

			<&clock_gcc clk_csi1_clk_src>,

			<&clock_gcc clk_gcc_camss_csi1_clk>,

			<&clock_gcc clk_gcc_camss_csi1pix_clk>,

			<&clock_gcc clk_gcc_camss_csi1rdi_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi1phy_clk>;

		clock-names = "ispif_ahb_clk", "camss_top_ahb_clk",

			"csi_ahb_clk", "csi_src_clk",

			"csi_clk", "csi_pix_clk",

			"csi_rdi_clk", "camss_ahb_clk", "camss_csi1_phy";

		qcom,clock-rates = <40000000 0 0 200000000 0 0 0 0 0>;

	};



	qcom,ispif@1b0a000 {

		cell-index = <0>;

		compatible = "qcom,ispif";

		reg = <0x1b0a000 0x500>,

			<0x1b00020 0x10>;

		reg-names = "ispif", "csi_clk_mux";

		interrupts = <0 51 0>;

		interrupt-names = "ispif";

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>;

		clock-names = "ispif_ahb_clk";

		qcom,clock-rates = <40000000>;

	};



	qcom,vfe@1b10000 {

		cell-index = <0>;

		compatible = "qcom,vfe32";

		reg = <0x1b10000 0x800>,

			<0x1b40000 0x200>;

		reg-names = "vfe", "vfe_vbif";

		interrupts = <0 52 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_vfe0_clk_src>,

			<&clock_gcc clk_gcc_camss_vfe0_clk>,

			<&clock_gcc clk_gcc_camss_csi_vfe0_clk>,

			<&clock_gcc clk_gcc_camss_vfe_ahb_clk>,

			<&clock_gcc clk_gcc_camss_vfe_axi_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>,

			<&clock_gcc clk_gcc_camss_top_ahb_clk>;

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

			"camss_vfe_vfe_clk", "camss_csi_vfe_clk", "iface_clk",

			"bus_clk", "camss_ahb_clk", "ispif_ahb_clk";

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



		qos-entries = <8>;

		qos-regs = <0x7BC 0x7C0 0x7C4 0x7C8 0x7CC 0x7D0

				0x7D4 0x798>;

		qos-settings = <0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0x00010000>;

		vbif-entries = <1>;

		vbif-regs = <0x04>;

		vbif-settings = <0x1>;

		ds-entries = <15>;

		ds-regs = <0x7D8 0x7DC 0x7E0 0x7E4 0x7E8

			0x7EC 0x7F0 0x7F4 0x7F8 0x7FC 0x800

			0x804 0x808 0x80C 0x810>;

		ds-settings = <0xCCCC1111 0xCCCC1111 0xCCCC1111

				0xCCCC1111 0xCCCC1111 0xCCCC1111

				0xCCCC1111 0xCCCC1111 0xCCCC1111

				0xCCCC1111 0xCCCC1111 0xCCCC1111

				0xCCCC1111 0xCCCC1111 0x00000103>;

		};

};

arch/arm/boot/dts/qcom/msm8909-pm8916-cdp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 
 * GNU General Public License for more details.

 */



#include "msm8909-pm8916.dtsi"

#include "msm8909-pinctrl.dtsi"

#include "msm8909-pm8916-camera-sensor-cdp.dtsi"



&soc {

	i2c@78b9000 {

		synaptics@20 {

arch/arm/boot/dts/qcom/msm8909-pm8916.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "msm-pm8916-rpm-regulator.dtsi"

#include "msm-pm8916.dtsi"

#include "msm8916-regulator.dtsi"

#include "msm8909-pm8916-camera.dtsi"



&soc {

	/* remove msm8916 acc/cpr regulator node */