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

Commit 119859a1 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 camera flash support for msm8937"

parents 2abf5cf1 29e7e5df

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

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
		qcom,csiphy-sd-index = <0>;

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

		qcom,mount-angle = <270>;

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

		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		cam_vana-supply = <&pm8937_l22>;

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

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
		qcom,csiphy-sd-index = <0>;

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

		qcom,mount-angle = <270>;

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

		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		cam_vana-supply = <&pm8937_l22>;

arch/arm/boot/dts/qcom/msm8937-pmi8937-cdp.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -13,3 +13,14 @@ 


#include "msm-pmi8937.dtsi"

#include "msm8937-cdp.dtsi"



&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8937_flash0 &pmi8937_flash1>;

		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,switch-source = <&pmi8937_switch>;

	};

};

arch/arm/boot/dts/qcom/msm8937-pmi8937-mtp.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -14,6 +14,17 @@ 
#include "msm-pmi8937.dtsi"

#include "msm8937-mtp.dtsi"



&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8937_flash0 &pmi8937_flash1>;

		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,switch-source = <&pmi8937_switch>;

	};

};



/{

	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

arch/arm/boot/dts/qcom/msm8937-pmi8950-cdp.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -14,6 +14,17 @@ 
#include "msm-pmi8950.dtsi"

#include "msm8937-cdp.dtsi"



&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8950_flash0 &pmi8950_flash1>;

		qcom,torch-source = <&pmi8950_torch0 &pmi8950_torch1>;

		qcom,switch-source = <&pmi8950_switch>;

	};

};



&mdss_dsi0 {

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;