Merge "ARM: dts: msm: Add flash node to Camera on Blair QRD" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration 2021-06-27 10:20:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0224b5756a

View file

@ -1,9 +1,14 @@
#include <dt-bindings/clock/qcom,gcc-blair.h>
#include <dt-bindings/msm/msm-camera.h>
&soc {
qcom,cam-res-mgr {
compatible = "qcom,cam-res-mgr";
status = "ok"
gpios-shared = <407>;
pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";
pinctrl-0 = <&cam_flash_hwen_active>;
pinctrl-1 = <&cam_flash_hwen_suspend>;
};
};
@ -94,6 +99,75 @@
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"
};
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 = <&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"
};
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 = <&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>;
@ -104,6 +178,7 @@
sensor-position-yaw = <180>;
actuator-src = <&actuator_rear>;
eeprom-src = <&eeprom_rear>;
led-flash-src = <&led_flash_rear>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L4P>;
cam_vaf-supply = <&L5P>;
@ -147,6 +222,7 @@
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
eeprom-src = <&eeprom_rear_aux2>;
led-flash-src = <&led_flash_rear_aux2>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
cam_vdig-supply = <&L1P>;
@ -390,6 +466,7 @@
sensor-position-yaw = <180>;
actuator-src = <&actuator_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
led-flash-src = <&led_flash_rear_aux>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;
cam_vdig-supply = <&L1P>;