Merge remote-tracking branch 'todor/release/qcomlt-4.4-camss-demo2' into release...

diff --cc arch/arm64/boot/dts/qcom/msm8916.dtsi
index e28c852a61640bb3b0a03a99212b77431ddc48bb,29a4774f757dff2dd7dcffc01c60e817d328d760..f6091aafc984dd541757059b3b32920e086b3e75
--- 1/arch/arm64/boot/dts/qcom/msm8916.dtsi
--- 2/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@@ -1063,39 -1319,52 +1256,82 @@@
                };
        };
  
 +      smsm {
 +              compatible = "qcom,smsm";
  
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +
 +              qcom,ipc-1 = <&apcs 0 13>;
 +              qcom,ipc-6 = <&apcs 0 19>;
 +
 +              apps_smsm: apps@0 {
 +                      reg = <0>;
 +
 +                      #qcom,state-cells = <1>;
 +              };
 +
 +              hexagon_smsm: hexagon@1 {
 +                      reg = <1>;
 +                      interrupts = <0 26 IRQ_TYPE_EDGE_RISING>;
 +
 +                      interrupt-controller;
 +                      #interrupt-cells = <2>;
 +              };
 +
 +              wcnss_smsm: wcnss@6 {
 +                      reg = <6>;
 +                      interrupts = <0 144 IRQ_TYPE_EDGE_RISING>;
 +
 +                      interrupt-controller;
 +                      #interrupt-cells = <2>;
 +              };
 +      };
  };
  
+ &i2c_freq_100Khz {
+       qcom,hw-thigh = <78>;
+       qcom,hw-tlow = <114>;
+       qcom,hw-tsu-sto = <28>;
+       qcom,hw-tsu-sta = <28>;
+       qcom,hw-thd-dat = <10>;
+       qcom,hw-thd-sta = <77>;
+       qcom,hw-tbuf = <118>;
+       qcom,hw-scl-stretch-en = <0>;
+       qcom,hw-trdhld = <6>;
+       qcom,hw-tsp = <1>;
+       status = "ok";
+ };
+ 
+ &i2c_freq_400Khz {
+       qcom,hw-thigh = <20>;
+       qcom,hw-tlow = <28>;
+       qcom,hw-tsu-sto = <21>;
+       qcom,hw-tsu-sta = <21>;
+       qcom,hw-thd-dat = <13>;
+       qcom,hw-thd-sta = <18>;
+       qcom,hw-tbuf = <32>;
+       qcom,hw-scl-stretch-en = <0>;
+       qcom,hw-trdhld = <6>;
+       qcom,hw-tsp = <3>;
+       status = "ok";
+ };
+ 
+ &i2c_freq_custom {
+       qcom,hw-thigh = <15>;
+       qcom,hw-tlow = <28>;
+       qcom,hw-tsu-sto = <21>;
+       qcom,hw-tsu-sta = <21>;
+       qcom,hw-thd-dat = <13>;
+       qcom,hw-thd-sta = <18>;
+       qcom,hw-tbuf = <25>;
+       qcom,hw-scl-stretch-en = <1>;
+       qcom,hw-trdhld = <6>;
+       qcom,hw-tsp = <3>;
+       status = "ok";
+ };
+ 
+ 
  #include "msm8916-pins.dtsi"
  #include "msm8916-iommu.dtsi"
  #include "msm8916-coresight.dtsi"