Merge "ARM: dts: msm: enable dynamic bit clock for SDM660 MTP panel"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm / boot / dts / qcom / sdm660.dtsi

diff --git a/arch/arm/boot/dts/qcom/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi
index 30d23cb..27bc0ce 100644 (file)
--- a/arch/arm/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660.dtsi
@@ -404,9 +404,14 @@
                };
 
                cont_splash_mem: splash_region@9d400000 {
-                       reg = <0x0 0x9d400000 0x0 0x02400000>;
+                       reg = <0x0 0x9d400000 0x0 0x23ff000>;
                        label = "cont_splash_mem";
                };
+
+               dfps_data_mem: dfps_data_mem@0x9f7ff000 {
+                      reg = <0 0x9f7ff000 0 0x00001000>;
+                      label = "dfps_data_mem";
+               };
        };
 
        bluetooth: bt_wcn3990 {
@@ -1570,11 +1575,12 @@
                };
        };
 
-       qcom,rmtfs_sharedmem@85e00000 {
+       qcom,rmtfs_sharedmem@0 {
                compatible = "qcom,sharedmem-uio";
-               reg = <0x85e00000 0x200000>;
+               reg = <0x0 0x200000>;
                reg-names = "rmtfs";
                qcom,client-id = <0x00000001>;
+               qcom,guard-memory;
        };
 
        qcom,rmnet-ipa {
@@ -2100,6 +2106,7 @@
                qcom,qdsp6v62-1-5;
                memory-region = <&modem_fw_mem>;
                qcom,mem-protect-id = <0xF>;
+               qcom,complete-ramdump;
                qcom,cx-ipeak-vote;
 
                /* GPIO inputs from mss */
@@ -2405,6 +2412,10 @@
                "HS_RB_G1_L1", "HS_RB_G2_L1", "HS_RB_G3_L1",
                "MAX";
 
+               pinctrl-names = "dev-reset-assert", "dev-reset-deassert";
+               pinctrl-0 = <&ufs_dev_reset_assert>;
+               pinctrl-1 = <&ufs_dev_reset_deassert>;
+
                resets = <&clock_gcc GCC_UFS_BCR>;
                reset-names = "core_reset";