From e34f959eeaf6fe72dbd2b1b8e8d0668c834d0c1a Mon Sep 17 00:00:00 2001
From: faust93 <[email protected]>
Date: Wed, 26 Jun 2019 15:48:05 +0300
Subject: [PATCH] sync dtb with latest dev. should fix camera

---
 .../dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi     |  1 +
 .../arm64/boot/dts/qcom/grus-sdm710-camera-sensor.dtsi | 10 ++++++++++
 arch/arm64/boot/dts/qcom/grus-sdm710.dtsi              |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi b/arch/arm64/boot/dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi
index eb25e33bf9fb..ad0827771963 100644
--- a/arch/arm64/boot/dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi
+++ b/arch/arm64/boot/dts/qcom/dsi-panel-samsung-fhd-ea8076-cmd.dtsi
@@ -63,6 +63,7 @@
                qcom,esd-err-irq-gpio = <&tlmm 78 0x2002>;
                qcom,elvss_dimming_check_enable;
                qcom,disp-doze-backlight-threshold = <8>;
+                qcom,disp-fod-off-dimming-delay = <0x55>;
                qcom,mdss-dsi-panel-elvss-dimming-read-length = <1>;
                qcom,mdss-dsi-dispparam-elvss-dimming-offset-command = [39 01 00 00 00 00 02 B0 07];
                qcom,mdss-dsi-dispparam-elvss-dimming-offset-command-state = "dsi_hs_mode";
diff --git a/arch/arm64/boot/dts/qcom/grus-sdm710-camera-sensor.dtsi b/arch/arm64/boot/dts/qcom/grus-sdm710-camera-sensor.dtsi
index bc039c71ae97..86d957128f6e 100644
--- a/arch/arm64/boot/dts/qcom/grus-sdm710-camera-sensor.dtsi
+++ b/arch/arm64/boot/dts/qcom/grus-sdm710-camera-sensor.dtsi
@@ -31,6 +31,15 @@
                switch-source = <&pm660l_switch0>;
                status = "ok";
        };
+       led_flash_rear_aux1: qcom,camera-flash@2{
+               cell-index = <2>;
+               reg = <0x02 0x00>;
+               compatible = "qcom,camera-flash";
+               flash-source = <&pm660l_flash0 &pm660l_flash1>;
+               torch-source = <&pm660l_torch0 &pm660l_torch1>;
+               switch-source = <&pm660l_switch0>;
+               status = "ok";
+       };
        camera_viodd_ldo: gpio-regulator@0 {
                compatible = "regulator-fixed";
                reg = <0x00 0x00>;
@@ -331,6 +340,7 @@
                sensor-position-pitch = <0>;
                sensor-position-yaw = <180>;
                eeprom-src = <&eeprom_rear_ultra>;
+               led-flash-src = <&led_flash_rear_aux1>;
                cam_vio-supply = <&camera_viodd_ldo>;
                cam_vana-supply = <&pm660l_bob>;
                cam_vdig-supply = <&pm660_s6>;
diff --git a/arch/arm64/boot/dts/qcom/grus-sdm710.dtsi b/arch/arm64/boot/dts/qcom/grus-sdm710.dtsi
index ca0fc8c97d63..6ec8f73c1758 100644
--- a/arch/arm64/boot/dts/qcom/grus-sdm710.dtsi
+++ b/arch/arm64/boot/dts/qcom/grus-sdm710.dtsi
@@ -449,7 +449,7 @@

 &soc {
        qcom,ion {
-               compatible = "qcom,msm-ion";
+               #compatible = "qcom,msm-ion";
                #address-cells = <1>;
                #size-cells = <0>;

--
2.21.0