Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'qcom-arm32-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm Arm32 DeviceTree updates for v6.18
Bring a few updates to the MSM8960 platform and add support for the Sony
Xperia SP.
Touch keys support is added to the Samsung Galaxy Grand 2.
A number of DeviceTree cleanups.
* tag 'qcom-arm32-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
ARM: dts: qcom: Use GIC_SPI for interrupt-map for readability
ARM: dts: qcom: sdx55: Add default GIC address cells
ARM: dts: qcom: ipq8064: Add default GIC address cells
ARM: dts: qcom: apq8064: Add default GIC address cells
ARM: dts: qcom: ipq4019: Add default GIC address cells
ARM: dts: qcom: apq8064-mako: Minor whitespace cleanup
ARM: dts: qcom: msm8226-samsung-ms013g: Add touch keys
ARM: dts: qcom: msm8974-samsung-hlte: Add touchkey support
ARM: dts: qcom: pm8921: add vibrator device node
ARM: dts: qcom: add device tree for Sony Xperia SP
dt-bindings: arm: qcom: add Sony Xperia SP
ARM: dts: qcom: msm8960: disable gsbi1 and gsbi5 nodes in msm8960 dtsi
ARM: dts: qcom: msm8960: add gsbi8 and its serial configuration
ARM: dts: qcom: msm8960: add sdcc3 pinctrl states
Link: https://lore.kernel.org/r/20250911220940.3023575-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+529
-27
+6
Documentation/devicetree/bindings/arm/qcom.yaml
+6
Documentation/devicetree/bindings/arm/qcom.yaml
+1
arch/arm/boot/dts/qcom/Makefile
+1
arch/arm/boot/dts/qcom/Makefile
+6
arch/arm/boot/dts/qcom/pm8921.dtsi
+6
arch/arm/boot/dts/qcom/pm8921.dtsi
+3
-3
arch/arm/boot/dts/qcom/qcom-apq8064-lg-nexus4-mako.dts
+3
-3
arch/arm/boot/dts/qcom/qcom-apq8064-lg-nexus4-mako.dts
···
34
34
#size-cells = <1>;
35
35
ranges;
36
36
37
-
ramoops@88d00000{
37
+
ramoops@88d00000 {
38
38
compatible = "ramoops";
39
39
reg = <0x88d00000 0x100000>;
40
40
record-size = <0x20000>;
···
326
326
*/
327
327
pm8921_s4: s4 {
328
328
regulator-always-on;
329
-
regulator-min-microvolt = <1800000>;
330
-
regulator-max-microvolt = <1800000>;
329
+
regulator-min-microvolt = <1800000>;
330
+
regulator-max-microvolt = <1800000>;
331
331
qcom,switch-mode-frequency = <1600000>;
332
332
bias-pull-down;
333
333
qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
+5
-4
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
+5
-4
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
···
342
342
intc: interrupt-controller@2000000 {
343
343
compatible = "qcom,msm-qgic2";
344
344
interrupt-controller;
345
+
#address-cells = <0>;
345
346
#interrupt-cells = <3>;
346
347
reg = <0x02000000 0x1000>,
347
348
<0x02002000 0x1000>;
···
1351
1350
interrupt-names = "msi";
1352
1351
#interrupt-cells = <1>;
1353
1352
interrupt-map-mask = <0 0 0 0x7>;
1354
-
interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
1355
-
<0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
1356
-
<0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
1357
-
<0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
1353
+
interrupt-map = <0 0 0 1 &intc GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
1354
+
<0 0 0 2 &intc GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
1355
+
<0 0 0 3 &intc GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
1356
+
<0 0 0 4 &intc GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
1358
1357
clocks = <&gcc PCIE_A_CLK>,
1359
1358
<&gcc PCIE_H_CLK>,
1360
1359
<&gcc PCIE_PHY_REF_CLK>;
+5
-4
arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
+5
-4
arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
···
175
175
intc: interrupt-controller@b000000 {
176
176
compatible = "qcom,msm-qgic2";
177
177
interrupt-controller;
178
+
#address-cells = <0>;
178
179
#interrupt-cells = <3>;
179
180
reg = <0x0b000000 0x1000>,
180
181
<0x0b002000 0x1000>;
···
429
428
interrupt-names = "msi";
430
429
#interrupt-cells = <1>;
431
430
interrupt-map-mask = <0 0 0 0x7>;
432
-
interrupt-map = <0 0 0 1 &intc 0 142 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
433
-
<0 0 0 2 &intc 0 143 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
434
-
<0 0 0 3 &intc 0 144 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
435
-
<0 0 0 4 &intc 0 145 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
431
+
interrupt-map = <0 0 0 1 &intc GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
432
+
<0 0 0 2 &intc GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
433
+
<0 0 0 3 &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
434
+
<0 0 0 4 &intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
436
435
clocks = <&gcc GCC_PCIE_AHB_CLK>,
437
436
<&gcc GCC_PCIE_AXI_M_CLK>,
438
437
<&gcc GCC_PCIE_AXI_S_CLK>;
+13
-12
arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
+13
-12
arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
···
527
527
intc: interrupt-controller@2000000 {
528
528
compatible = "qcom,msm-qgic2";
529
529
interrupt-controller;
530
+
#address-cells = <0>;
530
531
#interrupt-cells = <3>;
531
532
reg = <0x02000000 0x1000>,
532
533
<0x02002000 0x1000>;
···
1077
1076
interrupt-names = "msi";
1078
1077
#interrupt-cells = <1>;
1079
1078
interrupt-map-mask = <0 0 0 0x7>;
1080
-
interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
1081
-
<0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
1082
-
<0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
1083
-
<0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
1079
+
interrupt-map = <0 0 0 1 &intc GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
1080
+
<0 0 0 2 &intc GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
1081
+
<0 0 0 3 &intc GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
1082
+
<0 0 0 4 &intc GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
1084
1083
1085
1084
clocks = <&gcc PCIE_A_CLK>,
1086
1085
<&gcc PCIE_H_CLK>,
···
1138
1137
interrupt-names = "msi";
1139
1138
#interrupt-cells = <1>;
1140
1139
interrupt-map-mask = <0 0 0 0x7>;
1141
-
interrupt-map = <0 0 0 1 &intc 0 58 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
1142
-
<0 0 0 2 &intc 0 59 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
1143
-
<0 0 0 3 &intc 0 60 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
1144
-
<0 0 0 4 &intc 0 61 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
1140
+
interrupt-map = <0 0 0 1 &intc GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
1141
+
<0 0 0 2 &intc GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
1142
+
<0 0 0 3 &intc GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
1143
+
<0 0 0 4 &intc GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
1145
1144
1146
1145
clocks = <&gcc PCIE_1_A_CLK>,
1147
1146
<&gcc PCIE_1_H_CLK>,
···
1199
1198
interrupt-names = "msi";
1200
1199
#interrupt-cells = <1>;
1201
1200
interrupt-map-mask = <0 0 0 0x7>;
1202
-
interrupt-map = <0 0 0 1 &intc 0 72 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
1203
-
<0 0 0 2 &intc 0 73 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
1204
-
<0 0 0 3 &intc 0 74 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
1205
-
<0 0 0 4 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
1201
+
interrupt-map = <0 0 0 1 &intc GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
1202
+
<0 0 0 2 &intc GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
1203
+
<0 0 0 3 &intc GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
1204
+
<0 0 0 4 &intc GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
1206
1205
1207
1206
clocks = <&gcc PCIE_2_A_CLK>,
1208
1207
<&gcc PCIE_2_H_CLK>,
+2
arch/arm/boot/dts/qcom/qcom-msm8226-samsung-ms013g.dts
+2
arch/arm/boot/dts/qcom/qcom-msm8226-samsung-ms013g.dts
+40
arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi
+40
arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi
···
18
18
bias-bus-hold;
19
19
};
20
20
};
21
+
22
+
sdcc3_default_state: sdcc3-default-state {
23
+
clk-pins {
24
+
pins = "sdc3_clk";
25
+
drive-strength = <8>;
26
+
bias-disable;
27
+
};
28
+
29
+
cmd-pins {
30
+
pins = "sdc3_cmd";
31
+
drive-strength = <8>;
32
+
bias-pull-up;
33
+
};
34
+
35
+
data-pins {
36
+
pins = "sdc3_data";
37
+
drive-strength = <8>;
38
+
bias-pull-up;
39
+
};
40
+
};
41
+
42
+
sdcc3_sleep_state: sdcc3-sleep-state {
43
+
clk-pins {
44
+
pins = "sdc3_clk";
45
+
drive-strength = <2>;
46
+
bias-disable;
47
+
};
48
+
49
+
cmd-pins {
50
+
pins = "sdc3_cmd";
51
+
drive-strength = <2>;
52
+
bias-pull-up;
53
+
};
54
+
55
+
data-pins {
56
+
pins = "sdc3_data";
57
+
drive-strength = <2>;
58
+
bias-pull-up;
59
+
};
60
+
};
21
61
};
+5
arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
+5
arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
+361
arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts
+361
arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts
···
1
+
// SPDX-License-Identifier: GPL-2.0-only
2
+
/*
3
+
* Copyright (c) 2025, Antony Kurniawan Soemardi <linux@smankusors.com>
4
+
*/
5
+
#include <dt-bindings/gpio/gpio.h>
6
+
#include <dt-bindings/input/input.h>
7
+
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
8
+
#include <dt-bindings/reset/qcom,gcc-msm8960.h>
9
+
10
+
#include "qcom-msm8960.dtsi"
11
+
#include "pm8921.dtsi"
12
+
13
+
/ {
14
+
model = "Sony Xperia SP";
15
+
compatible = "sony,huashan", "qcom,msm8960t", "qcom,msm8960";
16
+
chassis-type = "handset";
17
+
18
+
aliases {
19
+
serial0 = &gsbi8_serial;
20
+
mmc0 = &sdcc1; /* SDCC1 eMMC slot */
21
+
mmc1 = &sdcc3; /* SDCC3 SD card slot */
22
+
};
23
+
24
+
chosen {
25
+
stdout-path = "serial0:115200n8";
26
+
};
27
+
28
+
gpio-keys {
29
+
compatible = "gpio-keys";
30
+
31
+
key-volume-up {
32
+
label = "Volume Up";
33
+
gpios = <&pm8921_gpio 21 GPIO_ACTIVE_LOW>;
34
+
debounce-interval = <10>;
35
+
linux,code = <KEY_VOLUMEUP>;
36
+
};
37
+
38
+
key-volume-down {
39
+
label = "Volume Down";
40
+
gpios = <&pm8921_gpio 20 GPIO_ACTIVE_LOW>;
41
+
debounce-interval = <10>;
42
+
linux,code = <KEY_VOLUMEDOWN>;
43
+
};
44
+
};
45
+
};
46
+
47
+
&gsbi8 {
48
+
qcom,mode = <GSBI_PROT_I2C_UART>;
49
+
status = "okay";
50
+
};
51
+
52
+
&gsbi8_serial {
53
+
status = "okay";
54
+
};
55
+
56
+
&pm8921 {
57
+
interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
58
+
};
59
+
60
+
&pm8921_gpio {
61
+
keypad_default_state: keypad-default-state {
62
+
keypad-sense-pins {
63
+
pins = "gpio1", "gpio2", "gpio3", "gpio4", "gpio5";
64
+
function = PMIC_GPIO_FUNC_NORMAL;
65
+
bias-pull-up;
66
+
input-enable;
67
+
power-source = <PM8921_GPIO_S4>;
68
+
qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
69
+
qcom,pull-up-strength = <PMIC_GPIO_PULL_UP_31P5>;
70
+
};
71
+
72
+
keypad-drive-pins {
73
+
pins = "gpio9", "gpio10";
74
+
function = PMIC_GPIO_FUNC_FUNC1;
75
+
bias-disable;
76
+
drive-open-drain;
77
+
output-low;
78
+
power-source = <PM8921_GPIO_S4>;
79
+
qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
80
+
};
81
+
};
82
+
};
83
+
84
+
&pm8921_keypad {
85
+
linux,keymap = <
86
+
MATRIX_KEY(1, 0, KEY_CAMERA_FOCUS)
87
+
MATRIX_KEY(1, 1, KEY_CAMERA)
88
+
>;
89
+
keypad,num-rows = <2>;
90
+
keypad,num-columns = <5>;
91
+
92
+
pinctrl-0 = <&keypad_default_state>;
93
+
pinctrl-names = "default";
94
+
95
+
status = "okay";
96
+
};
97
+
98
+
&rpm {
99
+
regulators {
100
+
compatible = "qcom,rpm-pm8921-regulators";
101
+
vin_lvs1_3_6-supply = <&pm8921_s4>;
102
+
vin_lvs2-supply = <&pm8921_s4>;
103
+
vin_lvs4_5_7-supply = <&pm8921_s4>;
104
+
vdd_ncp-supply = <&pm8921_l6>;
105
+
vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
106
+
vdd_l21_l23_l29-supply = <&pm8921_s8>;
107
+
vdd_l24-supply = <&pm8921_s1>;
108
+
vdd_l25-supply = <&pm8921_s1>;
109
+
vdd_l26-supply = <&pm8921_s7>;
110
+
vdd_l27-supply = <&pm8921_s7>;
111
+
vdd_l28-supply = <&pm8921_s7>;
112
+
vdd_l29-supply = <&pm8921_s8>;
113
+
114
+
/* Buck SMPS */
115
+
pm8921_s1: s1 {
116
+
regulator-always-on;
117
+
regulator-min-microvolt = <1225000>;
118
+
regulator-max-microvolt = <1225000>;
119
+
qcom,switch-mode-frequency = <3200000>;
120
+
bias-pull-down;
121
+
};
122
+
123
+
pm8921_s2: s2 {
124
+
regulator-min-microvolt = <1300000>;
125
+
regulator-max-microvolt = <1300000>;
126
+
qcom,switch-mode-frequency = <1600000>;
127
+
bias-pull-down;
128
+
};
129
+
130
+
pm8921_s3: s3 {
131
+
regulator-min-microvolt = <500000>;
132
+
regulator-max-microvolt = <1150000>;
133
+
qcom,switch-mode-frequency = <4800000>;
134
+
bias-pull-down;
135
+
};
136
+
137
+
pm8921_s4: s4 {
138
+
regulator-always-on;
139
+
regulator-min-microvolt = <1800000>;
140
+
regulator-max-microvolt = <1800000>;
141
+
qcom,switch-mode-frequency = <1600000>;
142
+
bias-pull-down;
143
+
qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
144
+
};
145
+
146
+
pm8921_s7: s7 {
147
+
regulator-min-microvolt = <1150000>;
148
+
regulator-max-microvolt = <1150000>;
149
+
qcom,switch-mode-frequency = <3200000>;
150
+
bias-pull-down;
151
+
};
152
+
153
+
pm8921_s8: s8 {
154
+
regulator-always-on;
155
+
regulator-min-microvolt = <2050000>;
156
+
regulator-max-microvolt = <2050000>;
157
+
qcom,switch-mode-frequency = <1600000>;
158
+
bias-pull-down;
159
+
};
160
+
161
+
/* PMOS LDO */
162
+
pm8921_l1: l1 {
163
+
regulator-always-on;
164
+
regulator-min-microvolt = <1050000>;
165
+
regulator-max-microvolt = <1050000>;
166
+
bias-pull-down;
167
+
};
168
+
169
+
pm8921_l2: l2 {
170
+
regulator-min-microvolt = <1200000>;
171
+
regulator-max-microvolt = <1200000>;
172
+
bias-pull-down;
173
+
};
174
+
175
+
pm8921_l3: l3 {
176
+
regulator-min-microvolt = <3075000>;
177
+
regulator-max-microvolt = <3075000>;
178
+
bias-pull-down;
179
+
};
180
+
181
+
pm8921_l4: l4 {
182
+
regulator-always-on;
183
+
regulator-min-microvolt = <1800000>;
184
+
regulator-max-microvolt = <1800000>;
185
+
bias-pull-down;
186
+
};
187
+
188
+
pm8921_l5: l5 {
189
+
regulator-min-microvolt = <2950000>;
190
+
regulator-max-microvolt = <2950000>;
191
+
bias-pull-down;
192
+
};
193
+
194
+
pm8921_l6: l6 {
195
+
regulator-min-microvolt = <2950000>;
196
+
regulator-max-microvolt = <2950000>;
197
+
bias-pull-down;
198
+
};
199
+
200
+
pm8921_l7: l7 {
201
+
regulator-always-on;
202
+
regulator-min-microvolt = <1850000>;
203
+
regulator-max-microvolt = <2950000>;
204
+
bias-pull-down;
205
+
};
206
+
207
+
pm8921_l8: l8 {
208
+
regulator-min-microvolt = <2800000>;
209
+
regulator-max-microvolt = <3000000>;
210
+
bias-pull-down;
211
+
};
212
+
213
+
pm8921_l9: l9 {
214
+
regulator-min-microvolt = <2850000>;
215
+
regulator-max-microvolt = <2850000>;
216
+
bias-pull-down;
217
+
};
218
+
219
+
pm8921_l10: l10 {
220
+
regulator-min-microvolt = <3000000>;
221
+
regulator-max-microvolt = <3000000>;
222
+
bias-pull-down;
223
+
};
224
+
225
+
pm8921_l11: l11 {
226
+
regulator-min-microvolt = <2600000>;
227
+
regulator-max-microvolt = <3000000>;
228
+
bias-pull-down;
229
+
};
230
+
231
+
pm8921_l12: l12 {
232
+
regulator-min-microvolt = <1050000>;
233
+
regulator-max-microvolt = <1200000>;
234
+
bias-pull-down;
235
+
};
236
+
237
+
pm8921_l14: l14 {
238
+
regulator-min-microvolt = <1800000>;
239
+
regulator-max-microvolt = <1800000>;
240
+
bias-pull-down;
241
+
};
242
+
243
+
pm8921_l15: l15 {
244
+
regulator-min-microvolt = <1800000>;
245
+
regulator-max-microvolt = <2950000>;
246
+
bias-pull-down;
247
+
};
248
+
249
+
pm8921_l16: l16 {
250
+
regulator-min-microvolt = <2600000>;
251
+
regulator-max-microvolt = <3000000>;
252
+
bias-pull-down;
253
+
};
254
+
255
+
pm8921_l17: l17 {
256
+
regulator-always-on;
257
+
regulator-min-microvolt = <1800000>;
258
+
regulator-max-microvolt = <3000000>;
259
+
bias-pull-down;
260
+
};
261
+
262
+
pm8921_l18: l18 {
263
+
regulator-min-microvolt = <1200000>;
264
+
regulator-max-microvolt = <1200000>;
265
+
bias-pull-down;
266
+
};
267
+
268
+
pm8921_l21: l21 {
269
+
regulator-min-microvolt = <1900000>;
270
+
regulator-max-microvolt = <1900000>;
271
+
bias-pull-down;
272
+
};
273
+
274
+
pm8921_l22: l22 {
275
+
regulator-min-microvolt = <2750000>;
276
+
regulator-max-microvolt = <2750000>;
277
+
bias-pull-down;
278
+
};
279
+
280
+
pm8921_l23: l23 {
281
+
regulator-always-on;
282
+
regulator-min-microvolt = <1800000>;
283
+
regulator-max-microvolt = <1800000>;
284
+
bias-pull-down;
285
+
};
286
+
287
+
pm8921_l24: l24 {
288
+
regulator-min-microvolt = <750000>;
289
+
regulator-max-microvolt = <1150000>;
290
+
bias-pull-down;
291
+
};
292
+
293
+
pm8921_l25: l25 {
294
+
regulator-always-on;
295
+
regulator-min-microvolt = <1225000>;
296
+
regulator-max-microvolt = <1225000>;
297
+
bias-pull-down;
298
+
};
299
+
300
+
/* Low Voltage Switch */
301
+
pm8921_lvs1: lvs1 {
302
+
bias-pull-down;
303
+
};
304
+
305
+
pm8921_lvs2: lvs2 {
306
+
bias-pull-down;
307
+
};
308
+
309
+
pm8921_lvs3: lvs3 {
310
+
bias-pull-down;
311
+
};
312
+
313
+
pm8921_lvs4: lvs4 {
314
+
bias-pull-down;
315
+
};
316
+
317
+
pm8921_lvs5: lvs5 {
318
+
bias-pull-down;
319
+
};
320
+
321
+
pm8921_lvs6: lvs6 {
322
+
bias-pull-down;
323
+
};
324
+
325
+
pm8921_lvs7: lvs7 {
326
+
bias-pull-down;
327
+
};
328
+
329
+
pm8921_ncp: ncp {
330
+
regulator-min-microvolt = <1800000>;
331
+
regulator-max-microvolt = <1800000>;
332
+
qcom,switch-mode-frequency = <1600000>;
333
+
};
334
+
};
335
+
};
336
+
337
+
&sdcc1 {
338
+
vmmc-supply = <&pm8921_l5>;
339
+
status = "okay";
340
+
};
341
+
342
+
&sdcc3 {
343
+
vmmc-supply = <&pm8921_l6>;
344
+
vqmmc-supply = <&pm8921_l7>;
345
+
346
+
pinctrl-0 = <&sdcc3_default_state>;
347
+
pinctrl-1 = <&sdcc3_sleep_state>;
348
+
pinctrl-names = "default", "sleep";
349
+
350
+
status = "okay";
351
+
};
352
+
353
+
&usb_hs1_phy {
354
+
v3p3-supply = <&pm8921_l3>;
355
+
v1p8-supply = <&pm8921_l4>;
356
+
};
357
+
358
+
&usb1 {
359
+
dr_mode = "otg";
360
+
status = "okay";
361
+
};
+32
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+32
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
···
322
322
323
323
syscon-tcsr = <&tcsr>;
324
324
325
+
status = "disabled";
326
+
325
327
gsbi5_serial: serial@16440000 {
326
328
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
327
329
reg = <0x16440000 0x1000>,
···
331
329
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
332
330
clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>;
333
331
clock-names = "core", "iface";
332
+
status = "disabled";
333
+
};
334
+
};
335
+
336
+
gsbi8: gsbi@1a000000 {
337
+
compatible = "qcom,gsbi-v1.0.0";
338
+
cell-index = <8>;
339
+
reg = <0x1a000000 0x100>;
340
+
clocks = <&gcc GSBI8_H_CLK>;
341
+
clock-names = "iface";
342
+
#address-cells = <1>;
343
+
#size-cells = <1>;
344
+
ranges;
345
+
346
+
syscon-tcsr = <&tcsr>;
347
+
348
+
status = "disabled";
349
+
350
+
gsbi8_serial: serial@1a040000 {
351
+
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
352
+
reg = <0x1a040000 0x1000>,
353
+
<0x1a000000 0x1000>;
354
+
interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
355
+
clocks = <&gcc GSBI8_UART_CLK>,
356
+
<&gcc GSBI8_H_CLK>;
357
+
clock-names = "core",
358
+
"iface";
359
+
334
360
status = "disabled";
335
361
};
336
362
};
···
446
416
#address-cells = <1>;
447
417
#size-cells = <1>;
448
418
ranges;
419
+
420
+
status = "disabled";
449
421
450
422
gsbi1_spi: spi@16080000 {
451
423
compatible = "qcom,spi-qup-v1.1.1";
+45
arch/arm/boot/dts/qcom/qcom-msm8974-samsung-hlte.dts
+45
arch/arm/boot/dts/qcom/qcom-msm8974-samsung-hlte.dts
···
50
50
};
51
51
};
52
52
53
+
i2c-touchkey {
54
+
compatible = "i2c-gpio";
55
+
56
+
sda-gpios = <&tlmm 95 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
57
+
scl-gpios = <&tlmm 96 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
58
+
59
+
pinctrl-0 = <&i2c_touchkey_pins>;
60
+
pinctrl-names = "default";
61
+
62
+
#address-cells = <1>;
63
+
#size-cells = <0>;
64
+
65
+
touchkey@20 {
66
+
compatible = "cypress,midas-touchkey";
67
+
reg = <0x20>;
68
+
69
+
interrupts-extended = <&pm8941_gpios 29 IRQ_TYPE_EDGE_FALLING>;
70
+
71
+
pinctrl-0 = <&touchkey_pin>;
72
+
pinctrl-names = "default";
73
+
74
+
vcc-supply = <&pm8941_lvs3>;
75
+
vdd-supply = <&pm8941_l13>;
76
+
77
+
linux,keycodes = <KEY_APPSELECT KEY_BACK>;
78
+
};
79
+
};
80
+
53
81
touch_ldo: regulator-touch {
54
82
compatible = "regulator-fixed";
55
83
regulator-name = "touch-ldo";
···
176
148
output-high;
177
149
power-source = <PM8941_GPIO_S3>;
178
150
qcom,drive-strength = <PMIC_GPIO_STRENGTH_HIGH>;
151
+
};
152
+
153
+
touchkey_pin: touchkey-int-state {
154
+
pins = "gpio29";
155
+
function = "normal";
156
+
bias-disable;
157
+
input-enable;
158
+
power-source = <PM8941_GPIO_S3>;
179
159
};
180
160
};
181
161
···
368
332
regulator-min-microvolt = <3075000>;
369
333
regulator-max-microvolt = <3075000>;
370
334
};
335
+
336
+
pm8941_lvs1: lvs1 {};
337
+
pm8941_lvs3: lvs3 {};
371
338
};
372
339
};
373
340
···
416
377
function = "sdc3";
417
378
drive-strength = <8>;
418
379
bias-disable;
380
+
};
381
+
382
+
i2c_touchkey_pins: i2c-touchkey-state {
383
+
pins = "gpio95", "gpio96";
384
+
function = "gpio";
385
+
bias-pull-up;
419
386
};
420
387
};
421
388
+5
-4
arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
+5
-4
arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
···
340
340
"msi8";
341
341
#interrupt-cells = <1>;
342
342
interrupt-map-mask = <0 0 0 0x7>;
343
-
interrupt-map = <0 0 0 1 &intc 0 141 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
344
-
<0 0 0 2 &intc 0 142 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
345
-
<0 0 0 3 &intc 0 143 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
346
-
<0 0 0 4 &intc 0 144 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
343
+
interrupt-map = <0 0 0 1 &intc GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
344
+
<0 0 0 2 &intc GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
345
+
<0 0 0 3 &intc GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
346
+
<0 0 0 4 &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
347
347
348
348
clocks = <&gcc GCC_PCIE_PIPE_CLK>,
349
349
<&gcc GCC_PCIE_AUX_CLK>,
···
707
707
compatible = "qcom,msm-qgic2";
708
708
interrupt-controller;
709
709
interrupt-parent = <&intc>;
710
+
#address-cells = <0>;
710
711
#interrupt-cells = <3>;
711
712
reg = <0x17800000 0x1000>,
712
713
<0x17802000 0x1000>;