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

Commit e7e72293 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: 8084 camera node gpio change"

parents 1959eb9b 349a35d4

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

+27 −23
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ 
		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-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;
@@ -81,26 +81,29 @@ 
	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x01>;

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

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

		reg = <0x1>;

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

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

		qcom,mount-angle = <90>;

		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-name = "cam_vdig", "cam_vana", "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,cam-vreg-min-voltage = <1200000 2800000 0>;

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

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

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

		gpios = <&msmgpio 17 0>,

			    <&msmgpio 25 0>;

		gpios = <&msmgpio 16 0>,

			<&msmgpio 38 0>,

			<&msmgpio 37 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-standby = <2>;

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

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

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

					  "CAM_RESET1",

					  "CAM_STANDBY1";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;
@@ -110,23 +113,24 @@ 
	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x2>;

		reg = <0x02>;

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

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

		qcom,mount-angle = <90>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

		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 18 0>,

			<&msmgpio 28 0>;

			<&msmgpio 25 0>,

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

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

+33 −29
Original line number Diff line number Diff line
@@ -50,17 +50,17 @@ 
		reg = <0x00>;

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

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

		qcom,mount-angle = <0>;

		qcom,actuator-src = <&actuator0>;

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

		qcom,mount-angle = <0>;

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

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

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

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

		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>,
@@ -69,10 +69,10 @@ 
		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,gpio-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";
@@ -81,26 +81,29 @@ 
	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x01>;

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

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

		reg = <0x1>;

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

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

		qcom,mount-angle = <0>;

		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-name = "cam_vdig", "cam_vana", "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,cam-vreg-min-voltage = <1200000 2800000 0>;

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

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

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

		gpios = <&msmgpio 17 0>,

			<&msmgpio 25 0>;

		gpios = <&msmgpio 16 0>,

			<&msmgpio 38 0>,

			<&msmgpio 37 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-standby = <2>;

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

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

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

					  "CAM_RESET1",

					  "CAM_STANDBY1";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;
@@ -110,23 +113,24 @@ 
	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x2>;

		reg = <0x02>;

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

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

		qcom,mount-angle = <0>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

		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 18 0>,

			<&msmgpio 28 0>;

			<&msmgpio 25 0>,

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

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

+27 −23
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ 
		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-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;
@@ -61,26 +61,29 @@ 
	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x01>;

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

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

		reg = <0x1>;

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

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

		qcom,mount-angle = <90>;

		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-name = "cam_vdig", "cam_vana", "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,cam-vreg-min-voltage = <1200000 2800000 0>;

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

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

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

		gpios = <&msmgpio 17 0>,

			    <&msmgpio 25 0>;

		gpios = <&msmgpio 16 0>,

			<&msmgpio 38 0>,

			<&msmgpio 37 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-standby = <2>;

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

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

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

					  "CAM_RESET1",

					  "CAM_STANDBY1";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;
@@ -90,23 +93,24 @@ 
	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x2>;

		reg = <0x02>;

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

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

		qcom,mount-angle = <90>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

		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 18 0>,

			<&msmgpio 28 0>;

			<&msmgpio 25 0>,

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

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

+39 −7
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ 
		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-req-tbl-label = "CAMIF_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};
@@ -62,7 +62,39 @@ 
	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x01>;

		reg = <0x1>;

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

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

		qcom,mount-angle = <0>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

		gpios = <&msmgpio 16 0>,

			<&msmgpio 38 0>,

			<&msmgpio 37 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_MCLK1",

					  "CAM_RESET1",

					  "CAM_STANDBY1";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

		status = "ok";

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x02>;

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

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

		qcom,mount-angle = <0>;
@@ -83,8 +115,8 @@ 
		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";

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <0>;

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

+4 −4
Original line number Diff line number Diff line
@@ -6484,12 +6484,12 @@ static struct clk_lookup apq_clocks_8084[] = { 
						"fda04000.qcom,cpp"),

	/* Camera Sensor Clocks */

	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, "1.qcom,camera"),

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

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

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

	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, "1.qcom,camera"),

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

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

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



	CLK_LOOKUP("iface_clk", mdss_ahb_clk.c, "fd900000.qcom,mdss_mdp"),