Skip to content

Commit 80a02b1

Browse files
committed
Merge tag 'qcom-arm32-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm Arm32 DeviceTree updates for v6.10 The QCA8074 PHY package found in IPQ4019 is properly described. The Sony Xperia Z2 Tablet is cleaned up and improved, vibrator support is added, upon support for Sony Xperia Z3 is added. Also based on MSM8974, support for Samsung Galaxy S5 China is introduced. The WiFi board type is added for these "klte" Samsung devices, to select appropriate NVRAM firmware file. Based on MSM8226, support for Motorola Moto G (2013) is added. Nodes representing the PCIe bridges under existing controllers are added for APQ8064, IPQ4019, IPQ8064, and SDX55. A number of fixes throughout to improve compliance with DeviceTree bindings. * tag 'qcom-arm32-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (22 commits) ARM: dts: qcom: msm8974: Add DTS for Samsung Galaxy S5 China (kltechn) ARM: dts: qcom: msm8974-klte-common: Pin WiFi board type ARM: dts: qcom: msm8974: Split out common part of samsung-klte ARM: dts: qcom: sdx55: Add PCIe bridge node ARM: dts: qcom: apq8064: Add PCIe bridge node ARM: dts: qcom: ipq4019: Add PCIe bridge node ARM: dts: qcom: ipq8064: Add PCIe bridge node ARM: dts: qcom: msm8974-sony-shinano: Enable vibrator ARM: dts: qcom: ipq4019: add QCA8075 PHY Package nodes ARM: dts: qcom: Add support for Motorola Moto G (2013) dt-bindings: arm: qcom: Add Motorola Moto G (2013) ARM: dts: qcom: msm8974: Add empty chosen node ARM: dts: qcom: msm8974: Add @0 to memory node name ARM: dts: qcom: Add Sony Xperia Z3 smartphone ARM: dts: qcom: msm8974-sony-castor: Split into shinano-common ARM: dts: qcom: msm8916: idle-state compatible require the generic idle-state ARM: dts: qcom: include cpu in idle-state node names ARM: dts: qcom: msm8974pro-castor: Rename wifi node name ARM: dts: qcom: msm8974pro-castor: Add debounce-interval for keys ARM: dts: qcom: msm8974pro-castor: Remove camera button definitions ... Link: https://lore.kernel.org/r/20240427163625.1432458-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents b0a1bb4 + 01088e2 commit 80a02b1

16 files changed

Lines changed: 1898 additions & 1376 deletions

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ properties:
137137
- microsoft,dempsey
138138
- microsoft,makepeace
139139
- microsoft,moneypenny
140+
- motorola,falcon
140141
- samsung,s3ve3g
141142
- const: qcom,msm8226
142143

arch/arm/boot/dts/qcom/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_ARCH_QCOM) += \
3+
msm8226-motorola-falcon.dtb \
34
qcom-apq8016-sbc.dtb \
45
qcom-apq8026-asus-sparrow.dtb \
56
qcom-apq8026-huawei-sturgeon.dtb \
@@ -45,7 +46,9 @@ dtb-$(CONFIG_ARCH_QCOM) += \
4546
qcom-msm8974pro-fairphone-fp2.dtb \
4647
qcom-msm8974pro-oneplus-bacon.dtb \
4748
qcom-msm8974pro-samsung-klte.dtb \
49+
qcom-msm8974pro-samsung-kltechn.dtb \
4850
qcom-msm8974pro-sony-xperia-shinano-castor.dtb \
51+
qcom-msm8974pro-sony-xperia-shinano-leo.dtb \
4952
qcom-mdm9615-wp8548-mangoh-green.dtb \
5053
qcom-sdx55-mtp.dtb \
5154
qcom-sdx55-t55.dtb \
Lines changed: 359 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,359 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
3+
/dts-v1/;
4+
5+
#include "qcom-msm8226.dtsi"
6+
#include "pm8226.dtsi"
7+
8+
/delete-node/ &smem_region;
9+
10+
/ {
11+
model = "Motorola Moto G (2013)";
12+
compatible = "motorola,falcon", "qcom,msm8226";
13+
chassis-type = "handset";
14+
15+
aliases {
16+
mmc0 = &sdhc_1;
17+
};
18+
19+
chosen {
20+
#address-cells = <1>;
21+
#size-cells = <1>;
22+
ranges;
23+
24+
framebuffer@3200000 {
25+
compatible = "simple-framebuffer";
26+
reg = <0x03200000 0x800000>;
27+
width = <720>;
28+
height = <1280>;
29+
stride = <(720 * 3)>;
30+
format = "r8g8b8";
31+
vsp-supply = <&reg_lcd_pos>;
32+
vsn-supply = <&reg_lcd_neg>;
33+
vddio-supply = <&vddio_disp_vreg>;
34+
};
35+
};
36+
37+
gpio-keys {
38+
compatible = "gpio-keys";
39+
40+
event-hall-sensor {
41+
label = "Hall Effect Sensor";
42+
gpios = <&tlmm 51 GPIO_ACTIVE_LOW>;
43+
linux,input-type = <EV_SW>;
44+
linux,code = <SW_LID>;
45+
linux,can-disable;
46+
};
47+
48+
key-volume-up {
49+
label = "Volume Up";
50+
gpios = <&tlmm 106 GPIO_ACTIVE_LOW>;
51+
linux,code = <KEY_VOLUMEUP>;
52+
debounce-interval = <15>;
53+
};
54+
};
55+
56+
vddio_disp_vreg: regulator-vddio-disp {
57+
compatible = "regulator-fixed";
58+
regulator-name = "vddio_disp";
59+
gpio = <&tlmm 34 GPIO_ACTIVE_HIGH>;
60+
vin-supply = <&pm8226_l8>;
61+
startup-delay-us = <300>;
62+
enable-active-high;
63+
regulator-boot-on;
64+
};
65+
66+
reserved-memory {
67+
#address-cells = <1>;
68+
#size-cells = <1>;
69+
ranges;
70+
71+
framebuffer@3200000 {
72+
reg = <0x03200000 0x800000>;
73+
no-map;
74+
};
75+
76+
dhob@f500000 {
77+
reg = <0x0f500000 0x40000>;
78+
no-map;
79+
};
80+
81+
shob@f540000 {
82+
reg = <0x0f540000 0x2000>;
83+
no-map;
84+
};
85+
86+
smem_region: smem@fa00000 {
87+
reg = <0x0fa00000 0x100000>;
88+
no-map;
89+
};
90+
91+
/* Actually <0x0fa00000 0x500000>, but first 100000 is smem */
92+
reserved@fb00000 {
93+
reg = <0x0fb00000 0x400000>;
94+
no-map;
95+
};
96+
};
97+
};
98+
99+
&blsp1_i2c3 {
100+
status = "okay";
101+
102+
regulator@3e {
103+
compatible = "ti,tps65132";
104+
reg = <0x3e>;
105+
pinctrl-0 = <&reg_lcd_default>;
106+
pinctrl-names = "default";
107+
108+
reg_lcd_pos: outp {
109+
regulator-name = "outp";
110+
regulator-min-microvolt = <4000000>;
111+
regulator-max-microvolt = <6000000>;
112+
regulator-active-discharge = <1>;
113+
regulator-boot-on;
114+
enable-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
115+
};
116+
117+
reg_lcd_neg: outn {
118+
regulator-name = "outn";
119+
regulator-min-microvolt = <4000000>;
120+
regulator-max-microvolt = <6000000>;
121+
regulator-active-discharge = <1>;
122+
regulator-boot-on;
123+
enable-gpios = <&tlmm 33 GPIO_ACTIVE_HIGH>;
124+
};
125+
};
126+
127+
temperature-sensor@48 {
128+
compatible = "ti,tmp108";
129+
reg = <0x48>;
130+
interrupts-extended = <&tlmm 13 IRQ_TYPE_LEVEL_LOW>;
131+
pinctrl-0 = <&temp_alert_default>;
132+
pinctrl-names = "default";
133+
#thermal-sensor-cells = <0>;
134+
};
135+
};
136+
137+
&pm8226_resin {
138+
linux,code = <KEY_VOLUMEDOWN>;
139+
status = "okay";
140+
};
141+
142+
&pm8226_vib {
143+
status = "okay";
144+
};
145+
146+
&rpm_requests {
147+
regulators {
148+
compatible = "qcom,rpm-pm8226-regulators";
149+
150+
pm8226_s3: s3 {
151+
regulator-min-microvolt = <1200000>;
152+
regulator-max-microvolt = <1300000>;
153+
};
154+
155+
pm8226_s4: s4 {
156+
regulator-min-microvolt = <1800000>;
157+
regulator-max-microvolt = <2200000>;
158+
};
159+
160+
pm8226_s5: s5 {
161+
regulator-min-microvolt = <1150000>;
162+
regulator-max-microvolt = <1150000>;
163+
};
164+
165+
pm8226_l1: l1 {
166+
regulator-min-microvolt = <1225000>;
167+
regulator-max-microvolt = <1225000>;
168+
};
169+
170+
pm8226_l2: l2 {
171+
regulator-min-microvolt = <1200000>;
172+
regulator-max-microvolt = <1200000>;
173+
};
174+
175+
pm8226_l3: l3 {
176+
regulator-min-microvolt = <750000>;
177+
regulator-max-microvolt = <1337500>;
178+
};
179+
180+
pm8226_l4: l4 {
181+
regulator-min-microvolt = <1200000>;
182+
regulator-max-microvolt = <1200000>;
183+
};
184+
185+
pm8226_l5: l5 {
186+
regulator-min-microvolt = <1200000>;
187+
regulator-max-microvolt = <1200000>;
188+
};
189+
190+
pm8226_l6: l6 {
191+
regulator-min-microvolt = <1800000>;
192+
regulator-max-microvolt = <1800000>;
193+
regulator-allow-set-load;
194+
};
195+
196+
pm8226_l7: l7 {
197+
regulator-min-microvolt = <1850000>;
198+
regulator-max-microvolt = <1850000>;
199+
};
200+
201+
pm8226_l8: l8 {
202+
regulator-min-microvolt = <1800000>;
203+
regulator-max-microvolt = <1800000>;
204+
};
205+
206+
pm8226_l9: l9 {
207+
regulator-min-microvolt = <2050000>;
208+
regulator-max-microvolt = <2050000>;
209+
};
210+
211+
pm8226_l10: l10 {
212+
regulator-min-microvolt = <1800000>;
213+
regulator-max-microvolt = <1800000>;
214+
};
215+
216+
pm8226_l12: l12 {
217+
regulator-min-microvolt = <1800000>;
218+
regulator-max-microvolt = <1800000>;
219+
};
220+
221+
pm8226_l14: l14 {
222+
regulator-min-microvolt = <2750000>;
223+
regulator-max-microvolt = <2750000>;
224+
};
225+
226+
pm8226_l15: l15 {
227+
regulator-min-microvolt = <2800000>;
228+
regulator-max-microvolt = <2800000>;
229+
};
230+
231+
pm8226_l16: l16 {
232+
regulator-min-microvolt = <3000000>;
233+
regulator-max-microvolt = <3350000>;
234+
};
235+
236+
pm8226_l17: l17 {
237+
regulator-min-microvolt = <2950000>;
238+
regulator-max-microvolt = <2950000>;
239+
};
240+
241+
pm8226_l18: l18 {
242+
regulator-min-microvolt = <2950000>;
243+
regulator-max-microvolt = <2950000>;
244+
};
245+
246+
pm8226_l19: l19 {
247+
regulator-min-microvolt = <2850000>;
248+
regulator-max-microvolt = <2850000>;
249+
};
250+
251+
pm8226_l20: l20 {
252+
regulator-min-microvolt = <3075000>;
253+
regulator-max-microvolt = <3075000>;
254+
};
255+
256+
pm8226_l21: l21 {
257+
regulator-min-microvolt = <1800000>;
258+
regulator-max-microvolt = <2950000>;
259+
regulator-allow-set-load;
260+
};
261+
262+
pm8226_l22: l22 {
263+
regulator-min-microvolt = <1800000>;
264+
regulator-max-microvolt = <2950000>;
265+
};
266+
267+
pm8226_l23: l23 {
268+
regulator-min-microvolt = <1800000>;
269+
regulator-max-microvolt = <2950000>;
270+
};
271+
272+
pm8226_l24: l24 {
273+
regulator-min-microvolt = <1300000>;
274+
regulator-max-microvolt = <1350000>;
275+
};
276+
277+
pm8226_l25: l25 {
278+
regulator-min-microvolt = <1775000>;
279+
regulator-max-microvolt = <2125000>;
280+
};
281+
282+
pm8226_l26: l26 {
283+
regulator-min-microvolt = <1225000>;
284+
regulator-max-microvolt = <1225000>;
285+
};
286+
287+
pm8226_l27: l27 {
288+
regulator-min-microvolt = <2050000>;
289+
regulator-max-microvolt = <2050000>;
290+
};
291+
292+
pm8226_l28: l28 {
293+
regulator-min-microvolt = <1800000>;
294+
regulator-max-microvolt = <3400000>;
295+
regulator-boot-on;
296+
};
297+
298+
pm8226_lvs1: lvs1 {
299+
regulator-always-on;
300+
};
301+
};
302+
};
303+
304+
&sdhc_1 {
305+
vmmc-supply = <&pm8226_l17>;
306+
vqmmc-supply = <&pm8226_l6>;
307+
308+
bus-width = <8>;
309+
non-removable;
310+
311+
status = "okay";
312+
};
313+
314+
&smbb {
315+
qcom,fast-charge-safe-current = <2000000>;
316+
qcom,fast-charge-current-limit = <1900000>;
317+
qcom,fast-charge-safe-voltage = <4400000>;
318+
qcom,minimum-input-voltage = <4300000>;
319+
320+
status = "okay";
321+
};
322+
323+
&tlmm {
324+
reg_lcd_default: reg-lcd-default-state {
325+
pins = "gpio31", "gpio33";
326+
function = "gpio";
327+
drive-strength = <2>;
328+
bias-disable;
329+
output-high;
330+
};
331+
332+
reg_vddio_disp_default: reg-vddio-disp-default-state {
333+
pins = "gpio34";
334+
function = "gpio";
335+
drive-strength = <2>;
336+
bias-disable;
337+
output-high;
338+
};
339+
340+
temp_alert_default: temp-alert-default-state {
341+
pins = "gpio13";
342+
function = "gpio";
343+
drive-strength = <2>;
344+
bias-disable;
345+
output-disable;
346+
};
347+
};
348+
349+
&usb {
350+
extcon = <&smbb>;
351+
dr_mode = "peripheral";
352+
status = "okay";
353+
};
354+
355+
&usb_hs_phy {
356+
extcon = <&smbb>;
357+
v1p8-supply = <&pm8226_l10>;
358+
v3p3-supply = <&pm8226_l20>;
359+
};

0 commit comments

Comments
 (0)