Advertisement
Guest User

Untitled

a guest
Apr 27th, 2017
85
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.00 KB | None | 0 0
  1. diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
  2. index c2d198b02357..8ec33a99dc6c 100644
  3. --- a/arch/arm/boot/dts/qcom/Makefile
  4. +++ b/arch/arm/boot/dts/qcom/Makefile
  5. @@ -1,4 +1,4 @@
  6. -dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
  7. +dtb-$(CONFIG_ARCH_MSM89961) += msm8996-v2-pmi8994-cdp.dtb \
  8. msm8996-v2-pmi8994-mtp.dtb \
  9. msm8996-v2-pmi8994-pmk8001-cdp.dtb \
  10. msm8996-v2-pmi8994-pmk8001-mtp.dtb \
  11. diff --git a/arch/arm/boot/dts/qcom/dsi-panel-auo-fte716-1080p-video.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-auo-fte716-1080p-video.dtsi
  12. index 5579ac813ce7..d39c7532eee0 100644
  13. --- a/arch/arm/boot/dts/qcom/dsi-panel-auo-fte716-1080p-video.dtsi
  14. +++ b/arch/arm/boot/dts/qcom/dsi-panel-auo-fte716-1080p-video.dtsi
  15. @@ -196,7 +196,7 @@
  16. qcom,mdss-dsi-lane-2-state;
  17. qcom,mdss-dsi-lane-3-state;
  18. qcom,mdss-dsi-panel-timings = [f9 3d 34 00 58 4d 36 3f 53 03 04 00];
  19. - qcom,mdss-dsi-panel-timings-8996 = [23 1F 07 09 05 03 04 a0
  20. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 1F 07 09 05 03 04 a0
  21. 23 1F 07 09 05 03 04 a0
  22. 23 1F 07 09 05 03 04 a0
  23. 23 1F 07 09 05 03 04 a0
  24. diff --git a/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-fhd-video.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-fhd-video.dtsi
  25. index f6b852708534..b7646eb6cf32 100644
  26. --- a/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-fhd-video.dtsi
  27. +++ b/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-fhd-video.dtsi
  28. @@ -85,7 +85,7 @@
  29. qcom,oled-hbm-mode;
  30. qcom,cont-splash-enabled;
  31. qcom,panel-supply-entries = <&dsi_panel_pwr_supply_amoled>;
  32. - qcom,mdss-dsi-panel-timings-8996 = [
  33. + qcom,mdss-dsi-panel-timings-phy-v2 = [
  34. 23 1F 07 09 05 03 04 a0
  35. 23 1F 07 09 05 03 04 a0
  36. 23 1F 07 09 05 03 04 a0
  37. diff --git a/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-p2-fhd-video.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-p2-fhd-video.dtsi
  38. index 5102d292febf..bc432b0994d8 100644
  39. --- a/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-p2-fhd-video.dtsi
  40. +++ b/arch/arm/boot/dts/qcom/dsi-panel-lgd-sw43101-p2-fhd-video.dtsi
  41. @@ -85,7 +85,7 @@
  42. qcom,oled-hbm-mode;
  43. qcom,cont-splash-enabled;
  44. qcom,panel-supply-entries = <&dsi_panel_pwr_supply_amoled>;
  45. - qcom,mdss-dsi-panel-timings-8996 = [
  46. + qcom,mdss-dsi-panel-timings-phy-v2 = [
  47. 23 1F 07 09 05 03 04 a0
  48. 23 1F 07 09 05 03 04 a0
  49. 23 1F 07 09 05 03 04 a0
  50. diff --git a/arch/arm/boot/dts/qcom/dsi-panel-samsung-s6e3hf3x01-dualmipi-wqhd-command.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-samsung-s6e3hf3x01-dualmipi-wqhd-command.dtsi
  51. index 2924f92a72d3..db64c3a0d61f 100644
  52. --- a/arch/arm/boot/dts/qcom/dsi-panel-samsung-s6e3hf3x01-dualmipi-wqhd-command.dtsi
  53. +++ b/arch/arm/boot/dts/qcom/dsi-panel-samsung-s6e3hf3x01-dualmipi-wqhd-command.dtsi
  54. @@ -92,7 +92,7 @@
  55. qcom,mdss-dsi-lp11-init;
  56. qcom,panel-supply-entries = <&dsi_panel_pwr_supply_amoled>;
  57.  
  58. - qcom,mdss-dsi-panel-timings-8996 = [
  59. + qcom,mdss-dsi-panel-timings-phy-v2 = [
  60. 23 20 06 09 05 03 04 a0
  61. 23 20 06 09 05 03 04 a0
  62. 23 20 06 09 05 03 04 a0
  63. diff --git a/arch/arm/boot/dts/qcom/dsi-panel-samsung-youm-s6e3hf3-dualmipi-wqhd-command.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-samsung-youm-s6e3hf3-dualmipi-wqhd-command.dtsi
  64. index 0b7f456844e2..7325a4a38af5 100644
  65. --- a/arch/arm/boot/dts/qcom/dsi-panel-samsung-youm-s6e3hf3-dualmipi-wqhd-command.dtsi
  66. +++ b/arch/arm/boot/dts/qcom/dsi-panel-samsung-youm-s6e3hf3-dualmipi-wqhd-command.dtsi
  67. @@ -93,7 +93,7 @@
  68. qcom,esd-err-irq-gpio = <&tlmm 29 0x2001>;
  69. qcom,panel-supply-entries = <&dsi_panel_pwr_supply_amoled>;
  70.  
  71. - qcom,mdss-dsi-panel-timings-8996 = [
  72. + qcom,mdss-dsi-panel-timings-phy-v2 = [
  73. 23 1e 07 08 05 03 04 a0
  74. 23 1e 07 08 05 03 04 a0
  75. 23 1e 07 08 05 03 04 a0
  76. diff --git a/arch/arm/boot/dts/qcom/dsi-panel-sharp-fte716-1080p-video.dtsi b/arch/arm/boot/dts/qcom/dsi-panel-sharp-fte716-1080p-video.dtsi
  77. index 40666d2d8223..f423eaa92106 100644
  78. --- a/arch/arm/boot/dts/qcom/dsi-panel-sharp-fte716-1080p-video.dtsi
  79. +++ b/arch/arm/boot/dts/qcom/dsi-panel-sharp-fte716-1080p-video.dtsi
  80. @@ -139,7 +139,7 @@
  81. qcom,mdss-dsi-lane-2-state;
  82. qcom,mdss-dsi-lane-3-state;
  83. qcom,mdss-dsi-panel-timings = [f9 3d 34 00 58 4d 36 3f 53 03 04 00];
  84. - qcom,mdss-dsi-panel-timings-8996 = [23 1F 07 09 05 03 04 a0
  85. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 1F 07 09 05 03 04 a0
  86. 23 1F 07 09 05 03 04 a0
  87. 23 1F 07 09 05 03 04 a0
  88. 23 1F 07 09 05 03 04 a0
  89. diff --git a/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi b/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
  90. index c912f7deb035..e3b50bbe5ff0 100644
  91. --- a/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
  92. +++ b/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
  93. @@ -275,7 +275,7 @@
  94. };
  95.  
  96. &dsi_jdi_fhd_r63452_video {
  97. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  98. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  99. 23 20 06 09 05 03 04 a0
  100. 23 20 06 09 05 03 04 a0
  101. 23 20 06 09 05 03 04 a0
  102. @@ -283,7 +283,7 @@
  103. };
  104.  
  105. &dsi_jdi_fhd_r63452_cmd {
  106. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  107. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  108. 23 20 06 09 05 03 04 a0
  109. 23 20 06 09 05 03 04 a0
  110. 23 20 06 09 05 03 04 a0
  111. @@ -291,7 +291,7 @@
  112. };
  113.  
  114. &dsi_jdi_fhd_r63452_j1_cmd {
  115. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  116. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  117. 23 20 06 09 05 03 04 a0
  118. 23 20 06 09 05 03 04 a0
  119. 23 20 06 09 05 03 04 a0
  120. @@ -299,7 +299,7 @@
  121. };
  122.  
  123. &dsi_jdi_fhd_r63452_pro_cmd {
  124. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  125. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  126. 23 20 06 09 05 03 04 a0
  127. 23 20 06 09 05 03 04 a0
  128. 23 20 06 09 05 03 04 a0
  129. @@ -307,7 +307,7 @@
  130. };
  131.  
  132. &dsi_jdi_fhd_r63452_j1_pro_cmd {
  133. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  134. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  135. 23 20 06 09 05 03 04 a0
  136. 23 20 06 09 05 03 04 a0
  137. 23 20 06 09 05 03 04 a0
  138. @@ -315,7 +315,7 @@
  139. };
  140.  
  141. &dsi_lgd_fhd_td4322_cmd {
  142. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  143. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  144. 23 20 06 09 05 03 04 a0
  145. 23 20 06 09 05 03 04 a0
  146. 23 20 06 09 05 03 04 a0
  147. @@ -323,7 +323,7 @@
  148. };
  149.  
  150. &dsi_lgd_fhd_td4722_cmd {
  151. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  152. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  153. 23 20 06 09 05 03 04 a0
  154. 23 20 06 09 05 03 04 a0
  155. 23 20 06 09 05 03 04 a0
  156. @@ -331,7 +331,7 @@
  157. };
  158.  
  159. &dsi_sharp_fhd_nt35695_video {
  160. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  161. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  162. 23 20 06 09 05 03 04 a0
  163. 23 20 06 09 05 03 04 a0
  164. 23 20 06 09 05 03 04 a0
  165. @@ -339,7 +339,7 @@
  166. };
  167.  
  168. &dsi_sharp_fhd_nt35695_cmd {
  169. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  170. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  171. 23 20 06 09 05 03 04 a0
  172. 23 20 06 09 05 03 04 a0
  173. 23 20 06 09 05 03 04 a0
  174. @@ -347,7 +347,7 @@
  175. };
  176.  
  177. &dsi_jdi_fhd_r63452_xcmd {
  178. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  179. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  180. 23 20 06 09 05 03 04 a0
  181. 23 20 06 09 05 03 04 a0
  182. 23 20 06 09 05 03 04 a0
  183. @@ -355,7 +355,7 @@
  184. };
  185.  
  186. &dsi_sharp_fhd_td4722_xcmd {
  187. - qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
  188. + qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
  189. 23 20 06 09 05 03 04 a0
  190. 23 20 06 09 05 03 04 a0
  191. 23 20 06 09 05 03 04 a0
  192. diff --git a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi
  193. index e704f93d25fe..2278079bbce3 100644
  194. --- a/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi
  195. +++ b/arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi
  196. @@ -1715,87 +1715,6 @@
  197. };
  198. };
  199.  
  200. - sec_mi2s {
  201. - sec_mi2s_sleep: sec_mi2s_sleep {
  202. - mux {
  203. - pins = "gpio80", "gpio81";
  204. - function = "sec_mi2s";
  205. - };
  206. -
  207. - config {
  208. - pins = "gpio80", "gpio81";
  209. - drive-strength = <2>; /* 2 mA */
  210. - bias-disable; /* NO PULL */
  211. - };
  212. - };
  213. - sec_mi2s_active: sec_mi2s_active {
  214. - mux {
  215. - pins = "gpio80", "gpio81";
  216. - function = "sec_mi2s";
  217. - };
  218. -
  219. - config {
  220. - pins = "gpio80", "gpio81";
  221. - drive-strength = <8>; /* 8 mA */
  222. - bias-disable; /* NO PULL */
  223. - };
  224. - };
  225. - };
  226. -
  227. - sec_mi2s_sd0 {
  228. - sec_mi2s_sd0_sleep: sec_mi2s_sd0_sleep {
  229. - mux {
  230. - pins = "gpio82";
  231. - function = "sec_mi2s";
  232. - };
  233. -
  234. - config {
  235. - pins = "gpio82";
  236. - drive-strength = <2>; /* 2 mA */
  237. - bias-pull-down; /* PULL DOWN */
  238. - };
  239. - };
  240. - sec_mi2s_sd0_active: sec_mi2s_sd0_active {
  241. - mux {
  242. - pins = "gpio82";
  243. - function = "sec_mi2s";
  244. - };
  245. -
  246. - config {
  247. - pins = "gpio82";
  248. - drive-strength = <8>; /* 8 mA */
  249. - bias-disable; /* NO PULL */
  250. - };
  251. - };
  252. - };
  253. -
  254. - sec_mi2s_sd1 {
  255. - sec_mi2s_sd1_sleep: sec_mi2s_sd1_sleep {
  256. - mux {
  257. - pins = "gpio83";
  258. - function = "sec_mi2s";
  259. - };
  260. -
  261. - config {
  262. - pins = "gpio83";
  263. - drive-strength = <2>; /* 2 mA */
  264. - bias-pull-down; /* PULL DOWN */
  265. - };
  266. - };
  267. - sec_mi2s_sd1_active: sec_mi2s_sd1_active {
  268. - mux {
  269. - pins = "gpio83";
  270. - function = "sec_mi2s";
  271. - };
  272. -
  273. - config {
  274. - pins = "gpio83";
  275. - drive-strength = <8>; /* 8 mA */
  276. - bias-disable; /* NO PULL */
  277. - };
  278. - };
  279. - };
  280. -
  281. tert_mi2s {
  282. tert_mi2s_sleep: tert_mi2s_sleep {
  283. mux {
  284. diff --git a/arch/arm/boot/dts/qcom/msm8996-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8996-regulator.dtsi
  285. index 8389c0458c8e..7a905f4cca3d 100644
  286. --- a/arch/arm/boot/dts/qcom/msm8996-regulator.dtsi
  287. +++ b/arch/arm/boot/dts/qcom/msm8996-regulator.dtsi
  288. @@ -1932,6 +1932,21 @@
  289. regulator-boot-on;
  290. gpio = <&tlmm 40 0>;
  291. };
  292. +
  293. + wlan_en_vreg: wlan_en_vreg {
  294. + compatible = "regulator-fixed";
  295. + regulator-name = "wlan_en_vreg";
  296. + enable-active-high;
  297. + gpio = <&pm8994_gpios 8 0>;
  298. + };
  299. +
  300. + hl7509_en_vreg: hl7509_en_vreg {
  301. + compatible = "regulator-fixed";
  302. + regulator-name = "hl7509_en_vreg";
  303. + gpio = <&pm8994_mpps 6 0>;
  304. + enable-active-high;
  305. + status = "disabled";
  306. + };
  307. };
  308.  
  309. &pmi8994_charger {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement