Skip to content

Commit 68f1d41

Browse files
committed
Merge tag 'qcom-arm64-for-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM64 DeviceTree updates for v6.7 The SM7125 platform is introduced, with support for Xiaomi Redmi Note 9 Pro. Support for Fairphone 5, on QCM6490, and BQ Aquaris M5, on MSM8939, are introduced. With the various QMP PHY bindings having been refactored, SC7180, SC7280, SDM845, SM8150, and SM8250 are transitioned to the new USB/DP combo PHY binding. IPQ6018, IPQ8074 MSM8998, SC7280, SC8180X, SDM845, SM8150, SM8250, and SM8450 are transitioned to the new PCIe PHY binding, and SC8180X is transitioned to the new UFS phy binding. The UFS power supply situation is clarified, and a range of boards across MSM8996, MSM8998, SM4250, SM6115, SM6125, SM8350, SM8450, and SM8550 receives corrections for this. On IPQ5018 watchdog support is introduced, and the SCM driver has SDI (debug image) enabled - so that it can be disabled. On IPQ5332 USB is enabled. The hwspinlock identifier is corrected across IPQ5332, IPQ6018, IPQ8074 and IPQ9574. The reserved-memory ranges for the remoteprocs on MSM8916 boards are refactored, to reduce the amount of duplicated boilerplate definitions. A number of nodes are transitioned to be disabled by default, to facilitate new boards. Samsung Galaxy Tab A 8.0 and Samsung Galaxy Tab A 9.7 gains display support, and the latter capacitive keys. Samsung Galaxy J5 gains accelerometer support. The Dragonboard 410c gains missing ADC7533 regulator definition, and an overlay forcing the board to operate in host mode, for automation purposes. On MSM8976, the outgoing IPC bits for modem and wcss are corrected, and reserved-memory regions are updated. Incorrect reserved-memory regions are also corrected for MSM8992 and MSM8994 devices. The QRB2210 RB1 board gets debug UART moved per hardware update. regulator voltage ranges are corrected, remoteprocs are enabled, USB SuperSpeed PHY is enabled, and GPIO LEDs are introduced for Bluetooth, WiFi and a user LED. Interrupts are described for the SGMII PHYs on SA8775P Ride platform, and the inline crypto engine is introduced for UFS. On SC7180 the audio DSP remoteproc is introduced. Additional SKUs of the Lazor boards are added.The RT5682 audio codec part is reorganized to be easier to maintain. On Trogdor devices, the touchscreen and display panels are linked to improve the power cycling behavior across the two. On SC7280 the cpuidle states are rewritten to support OS-initiated PCSI mode. LMH interrupts are added, to receive feedback when throttling occurs. The embedded usb debugger (EUD) description and the dummy usb-c-connector node is removed, as this is not correctly described. The USB3 pipe clock input of the global clock controller is properly described. Modem remoteproc is introduced on SDM630, and the SDM670 PDC mapping is corrected. On the SDM845 MTP PCIe support is introduced. The volumn down and reset buttons are defined. Remoteproc firmware names and the WiFI configuration is corrected. On Sony Xperia XZ2, XZ2 Compact, and XZ3 GPIO lines names are provided for TLMM and PMICs. The camera regulators are also added. Display hardware blocks are added to SM6125, and enabled on Sony Xperia 10 II. The ref clock is wired up to PCIe PHY on SM8150. On SM8250/QRB5165, and the RB5 board, the DisplayPort controller and the TCPM is introduced, with all the plumbing to get USB role and orientation switching, as well as DisplayPort altmode to work. Interconnects and power-domains are also described for the QUPs on this platform. Previously ignored PMICs are described for the SM8350 Hardware Development Kit (HDK), and PMR735a regulators are introduced. The pinctrl state for uart18 is corrected. On SM8450 HDK audio routes are corrected, to enable the analog microphones on the board. The addition of the PRNG is reverted, in favor of an upcoming additon of a true RNG. Constants are replaced with QCOM_SCM_VMID_* defines on a variety of boards. The SM8550 QRD board gets Bluetooth support, and the camera clock controller is described. Additionally, a number of fixes are introduced in a variety of platforms and boards, to align with Devicetree bindings. * tag 'qcom-arm64-for-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (148 commits) arm64: dts: qcom: apq8016-sbc: Add missing ADV7533 regulators ARM: dts: qcom: sdx65-mtp: Specify PM7250B SID to use arm64: dts: qcom: apq8016-sbc: Add overlay for usb host mode arm64: dts: qcom: qcm6490: Add device-tree for Fairphone 5 dt-bindings: arm: qcom: Add QCM6490 Fairphone 5 arm64: dts: qcom: pm8350c: Add flash led node arm64: dts: qcom: pm7250b: make SID configurable arm64: dts: qcom: sc7280: Mark some nodes as 'reserved' arm64: dts: qcom: msm8939: Fix iommu local address range arm64: dts: qcom: ipq5018: indicate that SDI should be disabled arm64: dts: qcom: msm8976: Fix ipc bit shifts arm64: dts: qcom: msm8976: Split lpass region arm64: dts: qcom: pm8150l: Add wled node arm64: dts: qcom: sa8775p: enable the inline crypto engine arm64: dts: qcom: msm8916/39: Fix venus memory size arm64: dts: qcom: msm8916/39: Move mpss_mem size to boards arm64: dts: qcom: msm8916/39: Disable unneeded firmware reservations arm64: dts: qcom: msm8939: Reserve firmware memory dynamically arm64: dts: qcom: msm8916: Reserve MBA memory dynamically arm64: dts: qcom: msm8916: Reserve firmware memory dynamically ... Link: https://lore.kernel.org/r/20231015191107.854658-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 1b42ff0 + 33e9032 commit 68f1d41

150 files changed

Lines changed: 8899 additions & 982 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ description: |
5050
msm8998
5151
qcs404
5252
qcm2290
53+
qcm6490
5354
qdu1000
5455
qrb2210
5556
qrb4210
@@ -79,6 +80,7 @@ description: |
7980
sm6125
8081
sm6350
8182
sm6375
83+
sm7125
8284
sm7225
8385
sm8150
8486
sm8250
@@ -189,6 +191,7 @@ properties:
189191

190192
- items:
191193
- enum:
194+
- longcheer,l9100
192195
- samsung,a7
193196
- sony,kanuti-tulip
194197
- square,apq8039-t2
@@ -391,6 +394,11 @@ properties:
391394
- const: qcom,qrb2210
392395
- const: qcom,qcm2290
393396

397+
- items:
398+
- enum:
399+
- fairphone,fp5
400+
- const: qcom,qcm6490
401+
394402
- description: Qualcomm Technologies, Inc. Distributed Unit 1000 platform
395403
items:
396404
- enum:
@@ -479,6 +487,11 @@ properties:
479487
- const: google,lazor-rev8
480488
- const: qcom,sc7180
481489

490+
- description: Acer Chromebook Spin 513 (rev9)
491+
items:
492+
- const: google,lazor-rev9
493+
- const: qcom,sc7180
494+
482495
- description: Acer Chromebook Spin 513 (newest rev)
483496
items:
484497
- const: google,lazor
@@ -500,6 +513,11 @@ properties:
500513
- const: google,lazor-rev8-sku2
501514
- const: qcom,sc7180
502515

516+
- description: Acer Chromebook Spin 513 with KB Backlight (rev9)
517+
items:
518+
- const: google,lazor-rev9-sku2
519+
- const: qcom,sc7180
520+
503521
- description: Acer Chromebook Spin 513 with KB Backlight (newest rev)
504522
items:
505523
- const: google,lazor-sku2
@@ -521,9 +539,16 @@ properties:
521539
- const: google,lazor-rev8-sku0
522540
- const: qcom,sc7180
523541

542+
- description: Acer Chromebook Spin 513 with LTE (rev9)
543+
items:
544+
- const: google,lazor-rev9-sku0
545+
- const: google,lazor-rev9-sku10
546+
- const: qcom,sc7180
547+
524548
- description: Acer Chromebook Spin 513 with LTE (newest rev)
525549
items:
526550
- const: google,lazor-sku0
551+
- const: google,lazor-sku10
527552
- const: qcom,sc7180
528553

529554
- description: Acer Chromebook 511 (rev4 - rev8)
@@ -535,9 +560,16 @@ properties:
535560
- const: google,lazor-rev8-sku4
536561
- const: qcom,sc7180
537562

563+
- description: Acer Chromebook 511 (rev9)
564+
items:
565+
- const: google,lazor-rev9-sku4
566+
- const: google,lazor-rev9-sku15
567+
- const: qcom,sc7180
568+
538569
- description: Acer Chromebook 511 (newest rev)
539570
items:
540571
- const: google,lazor-sku4
572+
- const: google,lazor-sku15
541573
- const: qcom,sc7180
542574

543575
- description: Acer Chromebook 511 without Touchscreen (rev4)
@@ -554,9 +586,16 @@ properties:
554586
- const: google,lazor-rev8-sku6
555587
- const: qcom,sc7180
556588

589+
- description: Acer Chromebook 511 without Touchscreen (rev9)
590+
items:
591+
- const: google,lazor-rev9-sku6
592+
- const: google,lazor-rev9-sku18
593+
- const: qcom,sc7180
594+
557595
- description: Acer Chromebook 511 without Touchscreen (newest rev)
558596
items:
559597
- const: google,lazor-sku6
598+
- const: google,lazor-sku18
560599
- const: qcom,sc7180
561600

562601
- description: Google Mrbland with AUO panel (rev0)
@@ -943,6 +982,11 @@ properties:
943982
- sony,pdx225
944983
- const: qcom,sm6375
945984

985+
- items:
986+
- enum:
987+
- xiaomi,joyeuse
988+
- const: qcom,sm7125
989+
946990
- items:
947991
- enum:
948992
- fairphone,fp4
@@ -1086,6 +1130,7 @@ allOf:
10861130
- qcom,sm6115
10871131
- qcom,sm6125
10881132
- qcom,sm6350
1133+
- qcom,sm7125
10891134
- qcom,sm7225
10901135
- qcom,sm8150
10911136
- qcom,sm8250

Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ description: |
1313
Qualcomm camera clock control module provides the clocks, resets and power
1414
domains on SM8450.
1515
16-
See also:: include/dt-bindings/clock/qcom,sm8450-camcc.h
16+
See also::
17+
include/dt-bindings/clock/qcom,sm8450-camcc.h
18+
include/dt-bindings/clock/qcom,sm8550-camcc.h
1719
1820
properties:
1921
compatible:
20-
const: qcom,sm8450-camcc
22+
enum:
23+
- qcom,sm8450-camcc
24+
- qcom,sm8550-camcc
2125

2226
clocks:
2327
items:

arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
*/
55
/dts-v1/;
66

7+
/* PM7250B is configured to use SID2/3 */
8+
#define PM7250B_SID 2
9+
#define PM7250B_SID1 3
10+
711
#include "qcom-sdx65.dtsi"
812
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
913
#include <arm64/qcom/pmk8350.dtsi>

arch/arm64/boot/dts/qcom/Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb
3+
4+
apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo
5+
6+
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb
37
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-d3-camera-mezzanine.dtb
48
dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.dtb
59
dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb
@@ -41,6 +45,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb
4145
dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb
4246
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
4347
dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb
48+
dtb-$(CONFIG_ARCH_QCOM) += msm8939-longcheer-l9100.dtb
4449
dtb-$(CONFIG_ARCH_QCOM) += msm8939-samsung-a7.dtb
4550
dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb
4651
dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb
@@ -81,6 +86,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-lilac.dtb
8186
dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-maple.dtb
8287
dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb
8388
dtb-$(CONFIG_ARCH_QCOM) += msm8998-xiaomi-sagit.dtb
89+
dtb-$(CONFIG_ARCH_QCOM) += qcm6490-fairphone-fp5.dtb
8490
dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb
8591
dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb
8692
dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb
@@ -112,11 +118,16 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb
112118
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9.dtb
113119
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-kb.dtb
114120
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-lte.dtb
121+
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10.dtb
122+
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-kb.dtb
123+
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-lte.dtb
115124
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r4.dtb
116125
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb
126+
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r10.dtb
117127
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb
118128
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb
119129
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb
130+
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r10.dtb
120131
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb
121132
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb
122133
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb
@@ -196,6 +207,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb
196207
dtb-$(CONFIG_ARCH_QCOM) += sm6125-xiaomi-laurel-sprout.dtb
197208
dtb-$(CONFIG_ARCH_QCOM) += sm6350-sony-xperia-lena-pdx213.dtb
198209
dtb-$(CONFIG_ARCH_QCOM) += sm6375-sony-xperia-murray-pdx225.dtb
210+
dtb-$(CONFIG_ARCH_QCOM) += sm7125-xiaomi-joyeuse.dtb
199211
dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb
200212
dtb-$(CONFIG_ARCH_QCOM) += sm8150-hdk.dtb
201213
dtb-$(CONFIG_ARCH_QCOM) += sm8150-microsoft-surface-duo.dtb
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
/dts-v1/;
4+
/plugin/;
5+
6+
&usb {
7+
dr_mode = "host";
8+
};

arch/arm64/boot/dts/qcom/apq8016-sbc.dts

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@
172172
pd-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
173173

174174
avdd-supply = <&pm8916_l6>;
175+
a2vdd-supply = <&pm8916_l6>;
176+
dvdd-supply = <&pm8916_l6>;
177+
pvdd-supply = <&pm8916_l6>;
175178
v1p2-supply = <&pm8916_l6>;
176179
v3p3-supply = <&pm8916_l17>;
177180

@@ -230,6 +233,10 @@
230233
status = "okay";
231234
};
232235

236+
&gpu {
237+
status = "okay";
238+
};
239+
233240
&lpass {
234241
status = "okay";
235242
};
@@ -238,6 +245,10 @@
238245
status = "okay";
239246
};
240247

248+
&mba_mem {
249+
status = "okay";
250+
};
251+
241252
&mdss {
242253
status = "okay";
243254
};
@@ -253,10 +264,13 @@
253264
firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
254265
};
255266

267+
&mpss_mem {
268+
status = "okay";
269+
reg = <0x0 0x86800000 0x0 0x2b00000>;
270+
};
271+
256272
&pm8916_codec {
257273
status = "okay";
258-
clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
259-
clock-names = "mclk";
260274
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
261275
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
262276
};
@@ -364,6 +378,14 @@
364378
extcon = <&usb_id>;
365379
};
366380

381+
&venus {
382+
status = "okay";
383+
};
384+
385+
&venus_mem {
386+
status = "okay";
387+
};
388+
367389
&wcnss {
368390
status = "okay";
369391
firmware-name = "qcom/apq8016/wcnss.mbn";
@@ -377,6 +399,10 @@
377399
compatible = "qcom,wcn3620";
378400
};
379401

402+
&wcnss_mem {
403+
status = "okay";
404+
};
405+
380406
/* Enable CoreSight */
381407
&cti0 { status = "okay"; };
382408
&cti1 { status = "okay"; };

arch/arm64/boot/dts/qcom/apq8039-t2.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@
131131
status = "okay";
132132
};
133133

134+
&gpu {
135+
status = "okay";
136+
};
137+
134138
&lpass {
135139
status = "okay";
136140
};
@@ -391,3 +395,7 @@
391395
&wcnss_iris {
392396
compatible = "qcom,wcn3680";
393397
};
398+
399+
&wcnss_mem {
400+
status = "okay";
401+
};

arch/arm64/boot/dts/qcom/apq8096-db820c.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,6 @@
10911091

10921092
vdda-phy-supply = <&vreg_l28a_0p925>;
10931093
vdda-pll-supply = <&vreg_l12a_1p8>;
1094-
vddp-ref-clk-supply = <&vreg_l25a_1p2>;
10951094
};
10961095

10971096
&ufshc {
@@ -1100,6 +1099,7 @@
11001099
vcc-supply = <&vreg_l20a_2p95>;
11011100
vccq-supply = <&vreg_l25a_1p2>;
11021101
vccq2-supply = <&vreg_s4a_1p8>;
1102+
vdd-hba-supply = <&vreg_l25a_1p2>;
11031103

11041104
vcc-max-microamp = <600000>;
11051105
vccq-max-microamp = <450000>;

arch/arm64/boot/dts/qcom/ipq5018.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
firmware {
5858
scm {
5959
compatible = "qcom,scm-ipq5018", "qcom,scm";
60+
qcom,sdi-enabled;
6061
};
6162
};
6263

@@ -181,6 +182,13 @@
181182
};
182183
};
183184

185+
watchdog: watchdog@b017000 {
186+
compatible = "qcom,apss-wdt-ipq5018", "qcom,kpss-wdt";
187+
reg = <0x0b017000 0x40>;
188+
interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
189+
clocks = <&sleep_clk>;
190+
};
191+
184192
timer@b120000 {
185193
compatible = "arm,armv7-timer-mem";
186194
reg = <0x0b120000 0x1000>;

arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212
/ {
1313
model = "Qualcomm Technologies, Inc. IPQ5332 MI01.6";
1414
compatible = "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332";
15+
16+
regulator_fixed_5p0: regulator-s0500 {
17+
compatible = "regulator-fixed";
18+
regulator-min-microvolt = <500000>;
19+
regulator-max-microvolt = <500000>;
20+
regulator-boot-on;
21+
regulator-always-on;
22+
regulator-name = "fixed_5p0";
23+
};
1524
};
1625

1726
&blsp1_spi0 {
@@ -79,3 +88,17 @@
7988
bias-pull-up;
8089
};
8190
};
91+
92+
&usb {
93+
status = "okay";
94+
};
95+
96+
&usb_dwc {
97+
dr_mode = "host";
98+
};
99+
100+
&usbphy0 {
101+
vdd-supply = <&regulator_fixed_5p0>;
102+
103+
status = "okay";
104+
};

0 commit comments

Comments
 (0)