API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 16th, 2017
115
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.57 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile                                                                                          
  2. index b8f2e0558ae8..4b6f63c6af0a 100644
  3. --- a/arch/arm/boot/dts/qcom/Makefile
  4. +++ b/arch/arm/boot/dts/qcom/Makefile
  5. @@ -252,7 +252,7 @@ dtb-$(CONFIG_ARCH_MSM8940) += msm8940-pmi8937-cdp.dtb \
  6.         msm8940-pmi8940-qrd-sku7.dtb
  7.  
  8.  ifeq ($(CONFIG_MACH_XIAOMI_MSM8953),y)
  9. -dtb-$(CONFIG_MACH_XIAOMI_MIDO) += msm8953-qrd-sku3.dtb
  10. +dtb-$(CONFIG_MACH_XIAOMI_MIDO) += msm8953-qrd-sku3-mido.dtb
  11.  else
  12.  dtb-$(CONFIG_ARCH_MSM8953) += msm8953-sim.dtb \
  13.         msm8953-rumi.dtb \
  14. diff --git a/arch/arm/boot/dts/qcom/mido/msm-pm8953.dtsi-mido.dtsi b/arch/arm/boot/dts/qcom/mido/msm-pm8953.dtsi-mido.dtsi
  15. index c1c8f1fea73b..a922279df254 100644
  16. --- a/arch/arm/boot/dts/qcom/mido/msm-pm8953.dtsi-mido.dtsi
  17. +++ b/arch/arm/boot/dts/qcom/mido/msm-pm8953.dtsi-mido.dtsi
  18. @@ -41,12 +41,12 @@
  19.                 pm8953_gpios: gpios {
  20.  
  21.                         gpio@c700 {
  22. -                               /delete-node/ status;
  23.                                 qcom,master-en = <0>;
  24. +                               /delete-node/ status;
  25.                         };
  26.                 };
  27. -
  28. -               /delete-node/ pm8953_typec: qcom,pm8953_typec@bf00
  29. -
  30. +               /delete-node/ pm8953_typec;
  31.         };
  32.  };
  33. +
  34. +
  35. diff --git a/arch/arm/boot/dts/qcom/mido/msm-pmi8950-mido.dtsi b/arch/arm/boot/dts/qcom/mido/msm-pmi8950-mido.dtsi
  36. index 80711b5e5b45..ce16faf46a5a 100644
  37. --- a/arch/arm/boot/dts/qcom/mido/msm-pmi8950-mido.dtsi
  38. +++ b/arch/arm/boot/dts/qcom/mido/msm-pmi8950-mido.dtsi
  39. @@ -10,6 +10,8 @@
  40.   * GNU General Public License for more details.
  41.   */
  42.  
  43. +//#include "../msm8953-pmi8950.dtsi"
  44. +
  45.  &spmi_bus {
  46.  
  47.         qcom,pmi8950@2 {
  48. @@ -24,16 +26,17 @@
  49.                                 qcom,out-strength = <2>;
  50.                                 status = "okay";
  51.                         };
  52. +               };
  53.  
  54.                 pmi8950_charger: qcom,qpnp-smbcharger {
  55.                         qcom,float-voltage-mv = <4400>;
  56.                         qcom,resume-delta-mv = <50>;
  57.                         qcom,charge-unknown-battery;
  58. +                       qcom,fastchg-current-comp = <900>;
  59. +                       qcom,float-voltage-comp = <11>;
  60.                         /delete-node/ qcom,parallel-usb-min-current-ma;
  61.                         /delete-node/ qcom,parallel-usb-9v-min-current-ma;
  62.                         /delete-node/ qcom,parallel-allowed-lowering-ma;
  63. -                       qcom,fastchg-current-comp = <900>;
  64. -                       qcom,float-voltage-comp = <11>;
  65.                 };
  66.  
  67.                 pmi8950_fg: qcom,fg {
  68. diff --git a/arch/arm/boot/dts/qcom/mido/msm8953-audio-mido.dtsi b/arch/arm/boot/dts/qcom/mido/msm8953-audio-mido.dtsi
  69. index 496c92e2f1f7..34ce5c204780 100644
  70. --- a/arch/arm/boot/dts/qcom/mido/msm8953-audio-mido.dtsi
  71. +++ b/arch/arm/boot/dts/qcom/mido/msm8953-audio-mido.dtsi
  72. @@ -11,6 +11,8 @@
  73.   * GNU General Public License for more details.
  74.   */
  75.  
  76. +#include "../msm8953-audio-mtp.dtsi"
  77. +
  78.  &int_codec {
  79.         qcom,msm-ext-pa = "primary";
  80.         qcom,msm-spk-ext-pa = <&tlmm 96 0>;
  81. diff --git a/arch/arm/boot/dts/qcom/mido/msm8953-mdss-panels-mido.dtsi b/arch/arm/boot/dts/qcom/mido/msm8953-mdss-panels-mido.dtsi
  82. index 06208d3e89db..02b11a162322 100644
  83. --- a/arch/arm/boot/dts/qcom/mido/msm8953-mdss-panels-mido.dtsi
  84. +++ b/arch/arm/boot/dts/qcom/mido/msm8953-mdss-panels-mido.dtsi
  85. @@ -14,3 +14,4 @@
  86.  #include "dsi-panel-nt35532-fhd-video.dtsi"
  87.  #include "dsi-panel-nt35596-fhd-video.dtsi"
  88.  #include "dsi-panel-nt35596-tianma-fhd-video.dtsi"
  89. +#include "../msm8953-mdss-panels.dtsi"
  90. \ No newline at end of file
  91. diff --git a/arch/arm/boot/dts/qcom/mido/msm8953-mido.dtsi b/arch/arm/boot/dts/qcom/mido/msm8953-mido.dtsi
  92. index 316179f15cb8..6c27112f2468 100644
  93. --- a/arch/arm/boot/dts/qcom/mido/msm8953-mido.dtsi
  94. +++ b/arch/arm/boot/dts/qcom/mido/msm8953-mido.dtsi
  95. @@ -10,7 +10,7 @@
  96.   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  97.   * GNU General Public License for more details.
  98.   */
  99. -
  100. +/ {
  101.         reserved-memory {
  102.                 other_ext_mem: other_ext_region@0 {
  103.                         reg = <0x0 0x84A00000 0x0 0x1E00000>;
  104. @@ -31,7 +31,7 @@
  105.                 reg-names = "sn-base";
  106.         };
  107.  
  108. -       /delete-node/qcom_seecom: qseecom@85b00000
  109. +       /delete-node/ qcom_seecom;
  110.         qcom_seecom: qseecom@84a00000 {
  111.                 compatible = "qcom,qseecom";
  112.                 reg = <0x84a00000 0x1900000>;
  113. @@ -76,3 +76,4 @@
  114.                                         0x9F 0x1C
  115.                                         0x00 0x18>;
  116.         };
  117. +};
  118. \ No newline at end of file
  119. diff --git a/arch/arm/boot/dts/qcom/mido/msm8953-qrd-mido.dtsi b/arch/arm/boot/dts/qcom/mido/msm8953-qrd-mido.dtsi
  120. index 98a2b72ddddb..ec95429269ad 100644
  121. --- a/arch/arm/boot/dts/qcom/mido/msm8953-qrd-mido.dtsi
  122. +++ b/arch/arm/boot/dts/qcom/mido/msm8953-qrd-mido.dtsi
  123. @@ -69,6 +69,7 @@
  124.                 pinctrl-2 = <&fpc_reset_active>;
  125.                 pinctrl-3 = <&fpc_irq_active>;
  126.         };
  127. +       i2c@78b7000 { /* BLSP1 QUP3 */
  128.                 focaltech@38 {
  129.                         compatible = "focaltech,5435";
  130.                         reg = <0x38>;
  131. @@ -125,7 +126,6 @@
  132.                         imagis,irq-gpio = <&tlmm 65 0x2008>;
  133.                         imagis,i2c-pull-up;
  134.                 };
  135. -
  136.         };
  137.  
  138.         i2c@78b6000 { /* BLSP1 QUP3 */
  139. diff --git a/arch/arm/boot/dts/qcom/mido/msm8953-qrd-sku3-mido.dtsi b/arch/arm/boot/dts/qcom/mido/msm8953-qrd-sku3-mido.dtsi
  140. index 49c9aa56d6dd..afd2e60472dc 100644
  141. --- a/arch/arm/boot/dts/qcom/mido/msm8953-qrd-sku3-mido.dtsi
  142. +++ b/arch/arm/boot/dts/qcom/mido/msm8953-qrd-sku3-mido.dtsi
  143. @@ -17,7 +17,6 @@
  144.  #include "msm8953-audio-mido.dtsi"
  145.  #include "msm8953-mdss-panels-mido.dtsi"
  146.  #include "msm8953-mdss-pll-mido.dtsi"
  147. -#include "msm8953-qrd-sku3-mido.dtsi"
  148.  #include "msm8953-pm-mido.dtsi"
  149.  #include "msm8953-qrd-mido.dtsi"
  150.  #include "msm8953-mido.dtsi"
  151. diff --git a/arch/arm/boot/dts/qcom/msm8953-qrd-sku3-mido.dts b/arch/arm/boot/dts/qcom/msm8953-qrd-sku3-mido.dts
  152. index 6d76d307ed3c..68706ce9c031 100644
  153. --- a/arch/arm/boot/dts/qcom/msm8953-qrd-sku3-mido.dts
  154. +++ b/arch/arm/boot/dts/qcom/msm8953-qrd-sku3-mido.dts
  155. @@ -12,10 +12,12 @@
  156.   */
  157.  
  158.  /dts-v1/;
  159. -
  160.  #include "msm8953.dtsi"
  161.  #include "msm-pmi8950.dtsi"
  162. +#include "msm8953-qrd-sku3.dtsi"
  163.  #include "mido/msm8953-qrd-sku3-mido.dtsi"
  164. +
  165. +
  166.  / {
  167.         model = "Qualcomm Technologies, Inc. MSM8953 + PMI8950 QRD SKU3";
  168.         compatible = "qcom,msm8953-qrd-sku3",
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!