Skip to content

Commit f510ca0

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt
Qualcomm ARM64 DT additional updates for 5.9 For SC7180 this adds the necessary properties for blowing fuses in qfprom, Coresight fixes, GPU interconnect votes and specifies max speed for USB controller. SM8150 and SM8250 gains Adreno SMMU, the graphics management unit and the GPU nodes, to enable headless GPU usage. SDM845 gains tracing support for deep idle, GPU bus bandwidth scaling and DB845c gains the LT9611 HDMI bridge wired up. MSM8994 gains SMD RPM and SCM support and a new dts for the Sony Xperia Z5. MSM8992 is refactored and modernized and gets support for SCM, SPMI, BLSP2 UART and I2C nodes, PMU, RPM clock controller, PSCI and proper CPU definitions. Support for the Xiaomi Libra and Microsoft Lumia 950 are added. * tag 'qcom-arm64-for-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (31 commits) arm64: dts: qcom: Add Microsoft Lumia 950 (Talkman) device tree arm64: dts: qcom: Add Xiaomi Libra (Mi 4C) device tree arm64: dts: qcom: msm8992: Add RPMCC node arm64: dts: qcom: msm8992: Add PSCI support. arm64: dts: qcom: msm8992: Add PMU node arm64: dts: qcom: msm8992: Add BLSP2_UART2 and I2C nodes arm64: dts: qcom: msm8992: Add SPMI PMIC arbiter device arm64: dts: qcom: msm8992: Add a SCM node arm64: dts: qcom: msm8992: Add a proper CPU map arm64: dts: qcom: bullhead: Move UART pinctrl to SoC arm64: dts: qcom: bullhead: Add qcom,msm-id arm64: dts: qcom: msm8992: Fix SDHCI1 arm64: dts: qcom: msm8992: Modernize the DTS style arm64: dts: qcom: Add support for Sony Xperia Z5 (SoMC Sumire-RoW) arm64: dts: qcom: Move msm8994-smd-rpm contents to lg-bullhead. arm64: dts: qcom: msm8994: Add support for SMD RPM arm64: dts: qcom: msm8992: Add a label to rpm-requests arm64: dts: qcom: msm8994: Add SCM node arm64: dts: qcom: sdm845-db845c: Add hdmi bridge nodes arm64: dts: qcom: add sm8250 GPU nodes ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 6fc013f + 9d56a1c commit f510ca0

17 files changed

+1820
-501
lines changed

‎arch/arm64/boot/dts/qcom/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb
99
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb
1010
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb
1111
dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb
12+
dtb-$(CONFIG_ARCH_QCOM) += msm8992-msft-lumia-talkman.dtb
13+
dtb-$(CONFIG_ARCH_QCOM) += msm8992-xiaomi-libra.dtb
1214
dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb
15+
dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-sumire.dtb
1316
dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb
1417
dtb-$(CONFIG_ARCH_QCOM) += msm8998-asus-novago-tp370ql.dtb
1518
dtb-$(CONFIG_ARCH_QCOM) += msm8998-hp-envy-x2.dtb

‎arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts

Lines changed: 235 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
model = "LG Nexus 5X";
1212
compatible = "lg,bullhead", "qcom,msm8992";
1313
/* required for bootloader to select correct board */
14+
qcom,msm-id = <251 0>, <252 0>;
1415
qcom,board-id = <0xb64 0>;
1516
qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>;
1617

@@ -22,15 +23,6 @@
2223
stdout-path = "serial0:115200n8";
2324
};
2425

25-
soc {
26-
serial@f991e000 {
27-
status = "okay";
28-
pinctrl-names = "default", "sleep";
29-
pinctrl-0 = <&blsp1_uart2_default>;
30-
pinctrl-1 = <&blsp1_uart2_sleep>;
31-
};
32-
};
33-
3426
reserved-memory {
3527
#address-cells = <2>;
3628
#size-cells = <2>;
@@ -47,4 +39,237 @@
4739
};
4840
};
4941

50-
#include "msm8994-smd-rpm.dtsi"
42+
&blsp1_uart2 {
43+
status = "okay";
44+
};
45+
46+
&rpm_requests {
47+
pm8994-regulators {
48+
compatible = "qcom,rpm-pm8994-regulators";
49+
50+
vdd_l1-supply = <&pm8994_s1>;
51+
vdd_l2_26_28-supply = <&pm8994_s3>;
52+
vdd_l3_11-supply = <&pm8994_s3>;
53+
vdd_l4_27_31-supply = <&pm8994_s3>;
54+
vdd_l5_7-supply = <&pm8994_s3>;
55+
vdd_l6_12_32-supply = <&pm8994_s5>;
56+
vdd_l8_16_30-supply = <&vreg_vph_pwr>;
57+
vdd_l9_10_18_22-supply = <&vreg_vph_pwr>;
58+
vdd_l13_19_23_24-supply = <&vreg_vph_pwr>;
59+
vdd_l14_15-supply = <&pm8994_s5>;
60+
vdd_l17_29-supply = <&vreg_vph_pwr>;
61+
vdd_l20_21-supply = <&vreg_vph_pwr>;
62+
vdd_l25-supply = <&pm8994_s5>;
63+
vdd_lvs1_2 = <&pm8994_s4>;
64+
65+
pm8994_s1: s1 {
66+
regulator-min-microvolt = <800000>;
67+
regulator-max-microvolt = <800000>;
68+
};
69+
70+
pm8994_s2: s2 {
71+
/* TODO */
72+
};
73+
74+
pm8994_s3: s3 {
75+
regulator-min-microvolt = <1300000>;
76+
regulator-max-microvolt = <1300000>;
77+
};
78+
79+
pm8994_s4: s4 {
80+
regulator-min-microvolt = <1800000>;
81+
regulator-max-microvolt = <1800000>;
82+
regulator-allow-set-load;
83+
regulator-system-load = <325000>;
84+
};
85+
86+
pm8994_s5: s5 {
87+
regulator-min-microvolt = <2150000>;
88+
regulator-max-microvolt = <2150000>;
89+
};
90+
91+
pm8994_s7: s7 {
92+
regulator-min-microvolt = <1000000>;
93+
regulator-max-microvolt = <1000000>;
94+
};
95+
96+
pm8994_l1: l1 {
97+
regulator-min-microvolt = <1000000>;
98+
regulator-max-microvolt = <1000000>;
99+
};
100+
101+
pm8994_l2: l2 {
102+
regulator-min-microvolt = <1250000>;
103+
regulator-max-microvolt = <1250000>;
104+
};
105+
106+
pm8994_l3: l3 {
107+
regulator-min-microvolt = <1200000>;
108+
regulator-max-microvolt = <1200000>;
109+
};
110+
111+
pm8994_l4: l4 {
112+
regulator-min-microvolt = <1225000>;
113+
regulator-max-microvolt = <1225000>;
114+
};
115+
116+
pm8994_l5: l5 {
117+
/* TODO */
118+
};
119+
120+
pm8994_l6: l6 {
121+
regulator-min-microvolt = <1800000>;
122+
regulator-max-microvolt = <1800000>;
123+
};
124+
125+
pm8994_l7: l7 {
126+
/* TODO */
127+
};
128+
129+
pm8994_l8: l8 {
130+
regulator-min-microvolt = <1800000>;
131+
regulator-max-microvolt = <1800000>;
132+
};
133+
134+
pm8994_l9: l9 {
135+
regulator-min-microvolt = <1800000>;
136+
regulator-max-microvolt = <1800000>;
137+
};
138+
139+
pm8994_l10: l10 {
140+
regulator-min-microvolt = <1800000>;
141+
regulator-max-microvolt = <1800000>;
142+
};
143+
144+
pm8994_l11: l11 {
145+
regulator-min-microvolt = <1200000>;
146+
regulator-max-microvolt = <1200000>;
147+
};
148+
149+
pm8994_l12: l12 {
150+
regulator-min-microvolt = <1800000>;
151+
regulator-max-microvolt = <1800000>;
152+
};
153+
154+
pm8994_l13: l13 {
155+
regulator-min-microvolt = <1800000>;
156+
regulator-max-microvolt = <2950000>;
157+
};
158+
159+
pm8994_l14: l14 {
160+
regulator-min-microvolt = <1200000>;
161+
regulator-max-microvolt = <1200000>;
162+
};
163+
164+
pm8994_l15: l15 {
165+
regulator-min-microvolt = <1800000>;
166+
regulator-max-microvolt = <1800000>;
167+
};
168+
169+
pm8994_l16: l16 {
170+
regulator-min-microvolt = <2700000>;
171+
regulator-max-microvolt = <2700000>;
172+
};
173+
174+
pm8994_l17: l17 {
175+
regulator-min-microvolt = <2700000>;
176+
regulator-max-microvolt = <2700000>;
177+
};
178+
179+
pm8994_l18: l18 {
180+
regulator-min-microvolt = <3000000>;
181+
regulator-max-microvolt = <3000000>;
182+
};
183+
184+
pm8994_l19: l19 {
185+
regulator-min-microvolt = <1800000>;
186+
regulator-max-microvolt = <1800000>;
187+
};
188+
189+
pm8994_l20: l20 {
190+
regulator-min-microvolt = <2950000>;
191+
regulator-max-microvolt = <2950000>;
192+
regulator-always-on;
193+
regulator-boot-on;
194+
regulator-allow-set-load;
195+
regulator-system-load = <570000>;
196+
};
197+
198+
pm8994_l21: l21 {
199+
regulator-min-microvolt = <1800000>;
200+
regulator-max-microvolt = <1800000>;
201+
regulator-always-on;
202+
};
203+
204+
pm8994_l22: l22 {
205+
regulator-min-microvolt = <3100000>;
206+
regulator-max-microvolt = <3100000>;
207+
};
208+
209+
pm8994_l23: l23 {
210+
regulator-min-microvolt = <2800000>;
211+
regulator-max-microvolt = <2800000>;
212+
};
213+
214+
pm8994_l24: l24 {
215+
regulator-min-microvolt = <3075000>;
216+
regulator-max-microvolt = <3150000>;
217+
};
218+
219+
pm8994_l25: l25 {
220+
regulator-min-microvolt = <1800000>;
221+
regulator-max-microvolt = <1800000>;
222+
};
223+
224+
pm8994_l26: l26 {
225+
/* TODO: value from downstream
226+
regulator-min-microvolt = <987500>;
227+
fails to apply */
228+
};
229+
230+
pm8994_l27: l27 {
231+
regulator-min-microvolt = <1050000>;
232+
regulator-max-microvolt = <1050000>;
233+
};
234+
235+
pm8994_l28: l28 {
236+
regulator-min-microvolt = <1000000>;
237+
regulator-max-microvolt = <1000000>;
238+
};
239+
240+
pm8994_l29: l29 {
241+
/* TODO: Unsupported voltage range.
242+
regulator-min-microvolt = <2800000>;
243+
regulator-max-microvolt = <2800000>;
244+
qcom,init-voltage = <2800000>;
245+
*/
246+
};
247+
248+
pm8994_l30: l30 {
249+
/* TODO: get this verified
250+
regulator-min-microvolt = <1800000>;
251+
regulator-max-microvolt = <1800000>;
252+
qcom,init-voltage = <1800000>;
253+
*/
254+
};
255+
256+
pm8994_l31: l31 {
257+
regulator-min-microvolt = <1262500>;
258+
regulator-max-microvolt = <1262500>;
259+
};
260+
261+
pm8994_l32: l32 {
262+
/* TODO: get this verified
263+
regulator-min-microvolt = <1800000>;
264+
regulator-max-microvolt = <1800000>;
265+
qcom,init-voltage = <1800000>;
266+
*/
267+
};
268+
};
269+
};
270+
271+
&sdhc_1 {
272+
status = "okay";
273+
274+
mmc-hs400-1_8v;
275+
};

‎arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
/*
3+
* Copyright (c) 2020, Konrad Dybcio
4+
*/
5+
6+
/dts-v1/;
7+
8+
#include "msm8992.dtsi"
9+
#include "pm8994.dtsi"
10+
#include "pmi8994.dtsi"
11+
#include <dt-bindings/gpio/gpio.h>
12+
#include <dt-bindings/input/gpio-keys.h>
13+
14+
/ {
15+
model = "Microsoft Lumia 950";
16+
compatible = "microsoft,talkman", "qcom,msm8992";
17+
18+
/* Most Lumia 950 users use GRUB to load their kernels,
19+
* hence there is no need for msm-id and friends.
20+
*/
21+
22+
/* This enables graphical output via bootloader-enabled display.
23+
* acpi=no is required due to WP platforms having ACPI support, but
24+
* only for Windows-based OSes.
25+
*/
26+
chosen {
27+
bootargs = "earlycon=efifb console=efifb acpi=no";
28+
29+
#address-cells = <2>;
30+
#size-cells = <2>;
31+
ranges;
32+
};
33+
};
34+
35+
&sdhc_1 {
36+
status = "okay";
37+
38+
mmc-hs200-1_8v;
39+
};

0 commit comments

Comments
 (0)