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

Commit 63bb07f2 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 for msm8909 target"

parents e9cd3654 6ecf08c6

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

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
- cell-index: vfe hardware core index

- compatible :

    - "qcom,vfe"

    - "qcom,vfe32"

    - "qcom,vfe40"

    - "qcom,vfe44"

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

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

+14 −12
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 


	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		reg = <0x3>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8909_l10>;

		cam_vaf-supply = <&pm8909_l8>;

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

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

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

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

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

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

	};
@@ -58,19 +58,21 @@ 
	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

		reg = <0x2>;

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

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

		qcom,mount-angle = <90>;

		qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pm8909_l2>;

		cam_vana-supply = <&pm8909_l17>;

		cam_vio-supply = <&pm8909_l6>;

		cam_vaf-supply = <&pm8909_l10>;

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

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

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

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

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

		cam_vaf-supply = <&pm8909_l8>;

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default>;
@@ -98,8 +100,8 @@ 
		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

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

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

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

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

		qcom,mount-angle = <90>;

		cam_vana-supply = <&pm8909_l17>;

		cam_vio-supply = <&pm8909_l6>;

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

+13 −14
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 


	actuator0: qcom,actuator@0 {

		cell-index = <0>;

		reg = <0x0>;

		reg = <0x3>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8909_l8>;

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

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

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

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

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

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

	};
@@ -58,7 +58,7 @@ 
	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

		reg = <0x0>;

		reg = <0x2>;

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

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

		qcom,mount-angle = <90>;
@@ -70,8 +70,8 @@ 
		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 1800000 2900000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default
@@ -100,17 +100,16 @@ 
		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

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

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

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

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

		qcom,mount-angle = <90>;

		cam_vdig-supply = <&pm8909_l2>;

		cam_vana-supply = <&pm8909_l17>;

		cam_vio-supply = <&pm8909_l6>;

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

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

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

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

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

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

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

+45 −68
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
			<&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_ahb_clk_src>,

			<&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",
@@ -47,19 +47,19 @@ 
		interrupt-names = "csid";

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

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

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

		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 = "camss_top_ahb_clk",

			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_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 = <0 0 0 200000000 0 0 0 0>;

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

     };



	qcom,csid@1b08400 {
@@ -71,97 +71,74 @@ 
		interrupt-names = "csid";

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

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

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

		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-names = "camss_top_ahb_clk",

			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_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 = <0 0 0 200000000 0 0 0 0>;

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

	};



	qcom,ispif@1b0a000 {

		cell-index = <0>;

		compatible = "qcom,ispif-v3.0", "qcom,ispif";

		compatible = "qcom,ispif";

		reg = <0x1b0a000 0x500>,

			<0x1b00020 0x10>;

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

		interrupts = <0 55 0>;

		interrupts = <0 51 0>;

		interrupt-names = "ispif";

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

		<&clock_gcc clk_gcc_camss_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_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_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_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_vfe0_clk_src>,

		<&clock_gcc clk_gcc_camss_vfe0_clk>,

		<&clock_gcc clk_gcc_camss_csi_vfe0_clk>,

		<&clock_gcc clk_vfe0_clk_src>,

		<&clock_gcc clk_gcc_camss_vfe0_clk>,

		<&clock_gcc clk_gcc_camss_csi_vfe0_clk>;

        clock-names = "ispif_ahb_clk","camss_ahb_clk",

            "csi0_src_clk", "csi0_clk",

            "csi0_pix_clk","csi0_rdi_clk", "csi1_src_clk",

            "csi1_clk", "csi1_pix_clk", "csi1_rdi_clk",

            "csi2_src_clk","csi2_clk", "csi2_pix_clk","csi2_rdi_clk",

            "csi3_src_clk","csi3_clk", "csi3_pix_clk",

            "csi3_rdi_clk", "vfe0_clk_src", "camss_vfe_vfe0_clk",

            "camss_csi_vfe0_clk","vfe1_clk_src","camss_vfe_vfe1_clk",

            "camss_csi_vfe1_clk";

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

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>;

		clock-names = "ispif_ahb_clk";

		qcom,clock-rates = < 80000000 >;

	};



	qcom,vfe@1b10000 {

		cell-index = <0>;

		compatible = "qcom,vfe40";

		reg = <0x1b10000 0x1000>,

		compatible = "qcom,vfe32";

		reg = <0x1b10000 0x800>,

			<0x1b40000 0x200>;

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

		interrupts = <0 57 0>;

		interrupts = <0 52 0>;

		interrupt-names = "vfe";

		vdd-supply = <&gdsc_vfe>;

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

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

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

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

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



		qos-entries = <8>;

		qos-regs = <0x2C4 0x2C8 0x2CC 0x2D0 0x2D4 0x2D8

				0x2DC 0x2E0>;

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

				0x7D4 0x798>;

		qos-settings = <0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0xAAA5AAA5 0xAAA5AAA5

				0xAAA5AAA5 0x0001AAA5>;

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

				0x44441111 0x44441111 0x44441111

				0x44441111 0x44441111 0x44441111

				0x44441111 0x44441111 0x44441111

				0x44441111 0x44441111 0x00000103>;

		};



	qcom,irqrouter@1b00000 {

		cell-index = <0>;

		compatible = "qcom,irqrouter";

		reg = <0x1b00000 0x100>;

		reg-names = "irqrouter";

	};

};

arch/arm/boot/dts/qcom/msm8909-mtp.dts

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
/dts-v1/;



#include "msm8909-mtp.dtsi"

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



/ {

	model = "Qualcomm Technologies, Inc. MSM8909 MTP";

	compatible = "qcom,msm8909-mtp", "qcom,msm8909", "qcom,mtp";