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

Commit d3234cfa authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 45c78100 on remote branch 

Change-Id: If1b35beefd16ae906b3d3313f6526c59ca23edc6
parents 748dea78 45c78100

khaje-camera-sensor-idp.dtsi

+61 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include <dt-bindings/msm/msm-camera.h>



&soc {

	qcom,cam-res-mgr {

	cam_res_mgr_label: qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

	};
@@ -181,6 +181,63 @@ 
		clock-rates = <19200000>;

	};



	led_flash_rear: qcom,camera-flash@0 {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L7P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L7P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	led_flash_rear_aux2: qcom,camera-flash@2 {

		cell-index = <2>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L7P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	 /* Rear*/

	qcom,cam-sensor0 {

		cell-index = <0>;
@@ -190,6 +247,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L4P>;
@@ -233,6 +291,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L3P>;
@@ -327,6 +386,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux2>;

		eeprom-src = <&eeprom_rear_aux2>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L6P>;

khaje-camera-sensor-qrd.dtsi

+61 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include <dt-bindings/msm/msm-camera.h>



&soc {

	qcom,cam-res-mgr {

	cam_res_mgr_label: qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

	};
@@ -181,6 +181,63 @@ 
		clock-rates = <19200000>;

	};



	led_flash_rear: qcom,camera-flash@0 {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L7P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L7P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	led_flash_rear_aux2: qcom,camera-flash@2 {

		cell-index = <2>;

		compatible = "qcom,camera-flash";

		cci-master = <1>;

		flash-type = <CAM_FLASH_TYPE_I2C>;

		cam_vio-supply = <&L7P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;

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

		gpio-req-tbl-label = "CUSTOM_GPIO1";

		status = "ok";

	};



	 /* Rear*/

	qcom,cam-sensor0 {

		cell-index = <0>;
@@ -190,6 +247,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L4P>;
@@ -233,6 +291,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L3P>;
@@ -327,6 +386,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux2>;

		eeprom-src = <&eeprom_rear_aux2>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L6P>;