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

Commit 8a2349d0 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add I2C flash node for holi pro" into camera-kernel.lnx.4.0

parents b6bd5f0d 50435b01

holi-camera-sensor-pm6125-cdp.dtsi

+28 −0
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,gcc-holi.h>

#include <dt-bindings/msm/msm-camera.h>



&soc {

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";
@@ -93,6 +95,29 @@ 
		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 = <&L6P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 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>;
@@ -102,6 +127,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 = <&L6P>;

		cam_vana-supply = <&L4P>;
@@ -145,6 +171,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear_aux2>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L3P>;
@@ -388,6 +415,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L7P>;

holi-camera-sensor-pm6125-mtp.dtsi

+28 −0
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,gcc-holi.h>

#include <dt-bindings/msm/msm-camera.h>



&soc {

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";
@@ -93,6 +95,29 @@ 
		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 = <&L6P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 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>;
@@ -102,6 +127,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 = <&L6P>;

		cam_vana-supply = <&L4P>;
@@ -145,6 +171,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear_aux2>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L3P>;
@@ -388,6 +415,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L7P>;

holi-camera-sensor-usbc-pm6125-mtp.dtsi

+28 −0
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,gcc-holi.h>

#include <dt-bindings/msm/msm-camera.h>



&soc {

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";
@@ -93,6 +95,29 @@ 
		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 = <&L6P>;

		regulator-names = "cam_vio";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 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>;
@@ -102,6 +127,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 = <&L6P>;

		cam_vana-supply = <&L4P>;
@@ -145,6 +171,7 @@ 
		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear_aux2>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L3P>;
@@ -388,6 +415,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&L6P>;

		cam_vana-supply = <&L7P>;