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

Commit cc423002 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: Remove imx135 and imx132 sensor nodes"

parents 46f3602a 5b1d1964

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

+0 −77
Original line number Diff line number Diff line
@@ -44,82 +44,6 @@ 
			"FLASH_NOW";

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

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

		qcom,mount-angle = <90>;

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

		qcom,sensor-name = "imx135";

		qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

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

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

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

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

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

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,

			<&msmgpio 35 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,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 30000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@6d {

		compatible = "qcom,imx132";

		reg = <0x6d>;

		qcom,slave-id = <0x6c 0x0 0x0132>;

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

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

		qcom,mount-angle = <270>;

		qcom,sensor-name = "imx132";

        cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

		gpios = <&msmgpio 17 0>,

			    <&msmgpio 25 0>;

		qcom,gpio-reset = <1>;

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

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

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

					  "CAM_XSHUTDOWN";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 4000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -158,7 +82,6 @@ 
		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x01>;

		qcom,slave-id = <0x6c 0x0 0x0132>;

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

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

		qcom,mount-angle = <90>;

arch/arm/boot/dts/qcom/apq8084-camera-sensor-liquid.dtsi

+0 −76
Original line number Diff line number Diff line
@@ -44,82 +44,6 @@ 
			"FLASH_NOW";

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

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

		qcom,mount-angle = <0>;

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

		qcom,sensor-name = "imx135";

		qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

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

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

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

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

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

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,

			<&msmgpio 35 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,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 30000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@6d {

		compatible = "qcom,imx132";

		reg = <0x6d>;

		qcom,slave-id = <0x6c 0x0 0x0132>;

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

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

		qcom,mount-angle = <0>;

		qcom,sensor-name = "imx132";

		cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

		gpios = <&msmgpio 17 0>,

			<&msmgpio 25 0>;

		qcom,gpio-reset = <1>;

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

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

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

				"CAM_XSHUTDOWN";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 4000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

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

+0 −75
Original line number Diff line number Diff line
@@ -25,81 +25,6 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

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

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

                qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

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

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

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

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

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

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,

			<&msmgpio 35 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,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 30000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@6d {

		compatible = "qcom,imx132";

		reg = <0x6d>;

		qcom,slave-id = <0x6c 0x0 0x0132>;

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

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

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx132";

        cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

		gpios = <&msmgpio 17 0>,

			    <&msmgpio 25 0>;

		qcom,gpio-reset = <1>;

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

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

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

					  "CAM_XSHUTDOWN";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 4000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

arch/arm/boot/dts/qcom/apq8084-camera-sensor-sbc.dtsi

+0 −78
Original line number Diff line number Diff line
@@ -26,84 +26,6 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	qcom,camera@20 {

		compatible = "qcom,imx135";

		reg = <0x20>;

		qcom,slave-id = <0x20 0x0016 0x0135>;

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

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

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

		qcom,actuator-src = <&actuator0>;

		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs2>;

		cam_vana-supply = <&pma8084_l17>;

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

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

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

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

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

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,

			<&msmgpio 35 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,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 30000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x1F>;

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

	        qcom,sensor-type = <0>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@6d {

		compatible = "qcom,imx132";

		reg = <0x6d>;

		qcom,slave-id = <0x6c 0x0 0x0132>;

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

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

		qcom,mount-angle = <0>;

		qcom,sensor-name = "imx132";

		cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs3>;

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

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

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

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

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

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

		gpios = <&msmgpio 17 0>,

			<&msmgpio 25 0>,

			<&msmgpio 78 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_MCLK2",

					  "CAM2_RESET",

					  "CAM2_STANDBY";

		qcom,gpio-set-tbl-num = <1 1>;

		qcom,gpio-set-tbl-flags = <0 2>;

		qcom,gpio-set-tbl-delay = <1000 4000>;

		qcom,csi-lane-assign = <0x4320>;

		qcom,csi-lane-mask = <0x7>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";

arch/arm/mach-msm/clock-8084.c

+0 −4
Original line number Diff line number Diff line
@@ -6476,16 +6476,12 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("iface_clk", camss_vfe_vfe_ahb_clk.c,

						"fda04000.qcom,cpp"),

	/* Camera Sensor Clocks */

	CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "20.qcom,camera"),

	CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "0.qcom,camera"),

	CLK_LOOKUP("",	mclk1_clk_src.c,	""),

	CLK_LOOKUP("cam_src_clk",	mclk2_clk_src.c, "6d.qcom,camera"),

	CLK_LOOKUP("cam_src_clk",	mclk2_clk_src.c, "1.qcom,camera"),

	CLK_LOOKUP("",	mclk3_clk_src.c,	""),

	CLK_LOOKUP("cam_clk", camss_mclk0_clk.c, "20.qcom,camera"),

	CLK_LOOKUP("cam_clk", camss_mclk0_clk.c, "0.qcom,camera"),

	CLK_LOOKUP("",	camss_mclk1_clk.c,	""),

	CLK_LOOKUP("cam_clk", camss_mclk2_clk.c, "6d.qcom,camera"),

	CLK_LOOKUP("cam_clk", camss_mclk2_clk.c, "1.qcom,camera"),

	CLK_LOOKUP("",	camss_mclk3_clk.c,	""),