A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ARM: dts: msm: Add shared gpio node for I2C flash for blair" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2021-06-25 01:28:20 -07:00 • committed by Gerrit - the friendly Code Review server
commit e99ef36be8
2 changed files with 104 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

54
blair-camera-sensor-cdp.dtsi
View file

@ -5,6 +5,10 @@
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>;
};
};
@ -118,6 +122,52 @@
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>;
@ -171,7 +221,7 @@
sensor-position-roll = <270>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
led-flash-src = <&led_flash_rear>;
led-flash-src = <&led_flash_rear_aux2>;
eeprom-src = <&eeprom_rear_aux2>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
@ -345,7 +395,7 @@
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
actuator-src = <&actuator_rear_aux>;
led-flash-src = <&led_flash_rear>;
led-flash-src = <&led_flash_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;

54
blair-camera-sensor-mtp.dtsi
View file

@ -5,6 +5,10 @@
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>;
};
};
@ -118,6 +122,52 @@
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>;
@ -171,7 +221,7 @@
sensor-position-roll = <270>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
led-flash-src = <&led_flash_rear>;
led-flash-src = <&led_flash_rear_aux2>;
eeprom-src = <&eeprom_rear_aux2>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
@ -415,7 +465,7 @@
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
actuator-src = <&actuator_rear_aux>;
led-flash-src = <&led_flash_rear>;
led-flash-src = <&led_flash_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;