Skip to content

Commit 6522fbd

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM64 DeviceTree updates for v6.6 Initial support for the SM4450 platform and the QRD device thereon is added. The IPQ5018 platform is introduced, and the RDP432-C2 board thereon. A shared definition of the IPQ5332 RDP is introduced, as is GPIO-based LEDs and buttons. On the IPQ9574 RDP433 USB, CPU cooling maps and regulators are added. On MSM8916, the D3 camera mezzanine is improved and refactored out to its own dts. The Samsung Galaxy S4 Mini gains support for its PMIC with charger, while Samsung Galaxy J5 and E5 gains touchscreen support. A few fixes for MSM8939 are introduced, and initial support for Samsung Galaxy A7 is add. Support for scaling the cache bus fabric is introduced on MSM8996. A missing interrupt for the USB2 controller is added. The touchscreen vio supply on Xiaomi Mi 5 is corrected, and a few other cleanups are introduces across other devices. The display controller is introduced for MSM8998, a few clock fixes are introduced and missing power domains are added for the multimedia subsystem iommu. Reserved memory-regions and reserved GPIO lists are updated for the QDU/QRU1000 IDPs. USB3 PHY is added to the QCM2290, the RB1 gains regulators and GPU is enabled for the RB2. PCIe and Ethernet support is introduced on SA8775P, and enabled for the Ride board. On SC7180 the PSCI integration is refactored, to allow supporting devices with the Qualcomm firmware. BWMON is introduced, alongside the CPUfreq-based bus voting. A number of fixes are added for SC8180X, on the Primus and Lenovo Flex 5G devices pmic_glink is introduced and wired up, to provide support for external display. Missing SCM interconnect is added to SC8280XP, and the PDC is marked as wakeup-parent of TLMM. On the CRD the gpio for vreg_misc_3p3 is corrected and a few regulators are renamed to align with schematics. The Lenovo Thinkpad X13s gains camera activity LED and a set of previously reserved GPIOs are released. The SA8540P Ride platform gains RTC support. For SDM670 CPU and L3 frequency scaling is added, the PDC is introduced and wired up as wakeup-parent of the TLMM. On SDM845 the UFS controller gains interconnect path description, power-domain information is added to GCC and minimum frequency of the UFS ICE is corrected. On RB3 continuous splash memory region is described, and the camera subsystem is enabled. On the Lenovo Yoga C630 a missing power supply for the display panel is added, and the debug UART is introduced. SDX75 RPMh power-domains and SPMI controller are introduces, the PMX75 PMIC is described and added to the IDP. GPU description is added to SM6115, and together with display enabled on the Lenovo Tab P11. On SM635 BWMON is introduced for LLCC and DDR scaling. Display and GPU is added, and the PDC is registered as wakeup-parent of TLMM. L3 cache scaling is introduced on SM6375. The DSI PHY compatible and an interrupt for I2C7 are corrected for SM8150, on the Sony Xperia 1 and 5 the ramoops pmsg size is corrected. On SM8250 BWMONs are introduced for DDR and LLCC scaling, the UFS node gains interconnect paths, SMMU is marked as DMA coherent and dynamic power coefficients are updated. On Sony Xperia 1 II and 5 II GPIO line names are updated. On SM8350 missing cluster sleep states and LMH interrupts are added, the CPU compatibles are corrected and APR and LPASS pinctrl support is introduced. The HDK gains uSD card support and PMK8350 is added. For SM8450 support for RNG and RPMh stats are added, the ICE handling is extracted from the UFS node and the display subsystem gains a missing interconnect path. Thermal description is improved for the HDK. On SM8550 MTP and QRD the pmic_glink is introduced, to provide DisplayPort output. A missing regulator supply is also added. A few platforms that happens to share the RPMH power-domain resource identifier constants are migrated to new generic defines. ADC channel names are generalized on various PMICs. A variety of devices gain chassis-type, and the GIC_SPI constant is replacing the 0 across a few different platforms. * tag 'qcom-arm64-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (215 commits) arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved arm64: dts: qcom: sm6350: Hook up PDC as wakeup-parent of TLMM arm64: dts: qcom: sdm670: Hook up PDC as wakeup-parent of TLMM arm64: dts: qcom: sa8775p: Hook up PDC as wakeup-parent of TLMM arm64: dts: qcom: sc8280xp: Hook up PDC as wakeup-parent of TLMM arm64: dts: qcom: sdm670: Add PDC arm64: dts: qcom: msm8916-samsung-e5: Add touchscreen arm64: dts: qcom: sc7180: Split up TF-A related PSCI configuration arm64: dts: qcom: sc8280xp-x13s: Add camera activity LED arm64: dts: qcom: sc8280xp-x13s: Unreserve NC pins arm64: dts: qcom: msm8998: Add DPU1 nodes arm64: dts: qcom: msm8996: Fix dsi1 interrupts arm64: dts: qcom: sdx75-idp: Add regulator nodes arm64: dts: qcom: sdx75: Add rpmhpd node arm64: dts: qcom: sdx75-idp: Add pmics supported in SDX75 arm64: dts: qcom: Add pmx75 PMIC dtsi arm64: dts: qcom: Add pm7550ba PMIC dtsi arm64: dts: qcom: Add pinctrl gpio support for pm7250b arm64: dts: qcom: sdx75: Add spmi node arm64: dts: qcom: msm8998: Add missing power domain to MMSS SMMU ... Link: https://lore.kernel.org/r/20230819034551.2537866-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 3b6d013 + 110e70f commit 6522fbd

File tree

174 files changed

+8956
-1972
lines changed

Some content is hidden

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

174 files changed

+8956
-1972
lines changed

‎Documentation/devicetree/bindings/arm/qcom-soc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ properties:
3131
compatible:
3232
oneOf:
3333
# Preferred naming style for compatibles of SoC components:
34-
- pattern: "^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+-.*$"
34+
- pattern: "^qcom,(apq|ipq|mdm|msm|qcm|qcs|sa|sc|sdm|sdx|sm)[0-9]+(pro)?-.*$"
3535
- pattern: "^qcom,(sa|sc)8[0-9]+[a-z][a-z]?-.*$"
3636

3737
# Legacy namings - variations of existing patterns/compatibles are OK,

‎Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ description: |
3030
apq8084
3131
apq8096
3232
ipq4018
33+
ipq5018
3334
ipq5332
3435
ipq6018
3536
ipq8074
@@ -72,6 +73,7 @@ description: |
7273
sdx65
7374
sdx75
7475
sm4250
76+
sm4450
7577
sm6115
7678
sm6115p
7779
sm6125
@@ -104,6 +106,7 @@ description: |
104106
hk10-c2
105107
idp
106108
liquid
109+
rdp432-c2
107110
mtp
108111
qrd
109112
rb2
@@ -186,6 +189,7 @@ properties:
186189

187190
- items:
188191
- enum:
192+
- samsung,a7
189193
- sony,kanuti-tulip
190194
- square,apq8039-t2
191195
- const: qcom,msm8939
@@ -339,6 +343,11 @@ properties:
339343
- qcom,ipq4019-dk04.1-c1
340344
- const: qcom,ipq4019
341345

346+
- items:
347+
- enum:
348+
- qcom,ipq5018-rdp432-c2
349+
- const: qcom,ipq5018
350+
342351
- items:
343352
- enum:
344353
- qcom,ipq5332-ap-mi01.2
@@ -902,6 +911,11 @@ properties:
902911
- const: qcom,qrb4210
903912
- const: qcom,sm4250
904913

914+
- items:
915+
- enum:
916+
- qcom,sm4450-qrd
917+
- const: qcom,sm4450
918+
905919
- items:
906920
- enum:
907921
- fxtec,pro1x

‎Documentation/devicetree/bindings/clock/qcom,ipq5018-gcc.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,ipq5018-gcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller on IPQ5018
8+
9+
maintainers:
10+
- Sricharan Ramabadhran <quic_srichara@quicinc.com>
11+
12+
description: |
13+
Qualcomm global clock control module provides the clocks, resets and power
14+
domains on IPQ5018
15+
16+
See also::
17+
include/dt-bindings/clock/qcom,ipq5018-gcc.h
18+
include/dt-bindings/reset/qcom,ipq5018-gcc.h
19+
20+
properties:
21+
compatible:
22+
const: qcom,gcc-ipq5018
23+
24+
clocks:
25+
items:
26+
- description: Board XO source
27+
- description: Sleep clock source
28+
- description: PCIE20 PHY0 pipe clock source
29+
- description: PCIE20 PHY1 pipe clock source
30+
- description: USB3 PHY pipe clock source
31+
- description: GEPHY RX clock source
32+
- description: GEPHY TX clock source
33+
- description: UNIPHY RX clock source
34+
- description: UNIPHY TX clk source
35+
36+
required:
37+
- compatible
38+
- clocks
39+
40+
allOf:
41+
- $ref: qcom,gcc.yaml#
42+
43+
unevaluatedProperties: false
44+
45+
examples:
46+
- |
47+
clock-controller@1800000 {
48+
compatible = "qcom,gcc-ipq5018";
49+
reg = <0x01800000 0x80000>;
50+
clocks = <&xo_board_clk>,
51+
<&sleep_clk>,
52+
<&pcie20_phy0_pipe_clk>,
53+
<&pcie20_phy1_pipe_clk>,
54+
<&usb3_phy0_pipe_clk>,
55+
<&gephy_rx_clk>,
56+
<&gephy_tx_clk>,
57+
<&uniphy_rx_clk>,
58+
<&uniphy_tx_clk>;
59+
#clock-cells = <1>;
60+
#reset-cells = <1>;
61+
#power-domain-cells = <1>;
62+
};
63+
...

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb
3+
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-d3-camera-mezzanine.dtb
34
dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.dtb
45
dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb
56
dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb
67
dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb
8+
dtb-$(CONFIG_ARCH_QCOM) += ipq5018-rdp432-c2.dtb
79
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp441.dtb
810
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp442.dtb
911
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp468.dtb
@@ -39,6 +41,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb
3941
dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb
4042
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
4143
dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb
44+
dtb-$(CONFIG_ARCH_QCOM) += msm8939-samsung-a7.dtb
4245
dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb
4346
dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb
4447
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb
@@ -186,6 +189,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb
186189
dtb-$(CONFIG_ARCH_QCOM) += sdm850-samsung-w737.dtb
187190
dtb-$(CONFIG_ARCH_QCOM) += sdx75-idp.dtb
188191
dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb
192+
dtb-$(CONFIG_ARCH_QCOM) += sm4450-qrd.dtb
189193
dtb-$(CONFIG_ARCH_QCOM) += sm6115-fxtec-pro1x.dtb
190194
dtb-$(CONFIG_ARCH_QCOM) += sm6115p-lenovo-j606f.dtb
191195
dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb

‎arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
/*
3+
* Copyright (c) 2015, The Linux Foundation. All rights reserved.
4+
* Copyright (c) 2023, Linaro Ltd.
5+
*/
6+
7+
/dts-v1/;
8+
9+
#include "apq8016-sbc.dts"
10+
11+
/ {
12+
camera_vdddo_1v8: camera-vdddo-1v8 {
13+
compatible = "regulator-fixed";
14+
regulator-name = "camera_vdddo";
15+
regulator-min-microvolt = <1800000>;
16+
regulator-max-microvolt = <1800000>;
17+
regulator-always-on;
18+
};
19+
20+
camera_vdda_2v8: camera-vdda-2v8 {
21+
compatible = "regulator-fixed";
22+
regulator-name = "camera_vdda";
23+
regulator-min-microvolt = <2800000>;
24+
regulator-max-microvolt = <2800000>;
25+
regulator-always-on;
26+
};
27+
28+
camera_vddd_1v5: camera-vddd-1v5 {
29+
compatible = "regulator-fixed";
30+
regulator-name = "camera_vddd";
31+
regulator-min-microvolt = <1500000>;
32+
regulator-max-microvolt = <1500000>;
33+
regulator-always-on;
34+
};
35+
};
36+
37+
&camss {
38+
status = "okay";
39+
40+
ports {
41+
port@0 {
42+
reg = <0>;
43+
csiphy0_ep: endpoint {
44+
data-lanes = <0 2>;
45+
remote-endpoint = <&ov5640_ep>;
46+
};
47+
};
48+
};
49+
};
50+
51+
&cci {
52+
status = "okay";
53+
};
54+
55+
&cci_i2c0 {
56+
camera_rear@3b {
57+
compatible = "ovti,ov5640";
58+
reg = <0x3b>;
59+
60+
powerdown-gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
61+
reset-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
62+
pinctrl-names = "default";
63+
pinctrl-0 = <&camera_rear_default>;
64+
65+
clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
66+
clock-names = "xclk";
67+
assigned-clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
68+
assigned-clock-rates = <23880000>;
69+
70+
DOVDD-supply = <&camera_vdddo_1v8>;
71+
AVDD-supply = <&camera_vdda_2v8>;
72+
DVDD-supply = <&camera_vddd_1v5>;
73+
74+
port {
75+
ov5640_ep: endpoint {
76+
data-lanes = <1 2>;
77+
remote-endpoint = <&csiphy0_ep>;
78+
};
79+
};
80+
};
81+
};

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

Lines changed: 6 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,6 @@
3434
stdout-path = "serial0";
3535
};
3636

37-
camera_vdddo_1v8: camera-vdddo-1v8 {
38-
compatible = "regulator-fixed";
39-
regulator-name = "camera_vdddo";
40-
regulator-min-microvolt = <1800000>;
41-
regulator-max-microvolt = <1800000>;
42-
regulator-always-on;
43-
};
44-
45-
camera_vdda_2v8: camera-vdda-2v8 {
46-
compatible = "regulator-fixed";
47-
regulator-name = "camera_vdda";
48-
regulator-min-microvolt = <2800000>;
49-
regulator-max-microvolt = <2800000>;
50-
regulator-always-on;
51-
};
52-
53-
camera_vddd_1v5: camera-vddd-1v5 {
54-
compatible = "regulator-fixed";
55-
regulator-name = "camera_vddd";
56-
regulator-min-microvolt = <1500000>;
57-
regulator-max-microvolt = <1500000>;
58-
regulator-always-on;
59-
};
60-
6137
reserved-memory {
6238
ramoops@bff00000 {
6339
compatible = "ramoops";
@@ -77,7 +53,7 @@
7753

7854
usb_id: usb-id {
7955
compatible = "linux,extcon-usb-gpio";
80-
id-gpio = <&tlmm 121 GPIO_ACTIVE_HIGH>;
56+
id-gpios = <&tlmm 121 GPIO_ACTIVE_HIGH>;
8157
pinctrl-names = "default";
8258
pinctrl-0 = <&usb_id_default>;
8359
};
@@ -172,15 +148,13 @@
172148
};
173149

174150
&blsp_i2c2 {
175-
/* On Low speed expansion */
151+
/* On Low speed expansion: LS-I2C0 */
176152
status = "okay";
177-
label = "LS-I2C0";
178153
};
179154

180155
&blsp_i2c4 {
181-
/* On High speed expansion */
156+
/* On High speed expansion: HS-I2C2 */
182157
status = "okay";
183-
label = "HS-I2C2";
184158

185159
adv_bridge: bridge@39 {
186160
status = "okay";
@@ -228,21 +202,18 @@
228202
};
229203

230204
&blsp_i2c6 {
231-
/* On Low speed expansion */
205+
/* On Low speed expansion: LS-I2C1 */
232206
status = "okay";
233-
label = "LS-I2C1";
234207
};
235208

236209
&blsp_spi3 {
237-
/* On High speed expansion */
210+
/* On High speed expansion: HS-SPI1 */
238211
status = "okay";
239-
label = "HS-SPI1";
240212
};
241213

242214
&blsp_spi5 {
243-
/* On Low speed expansion */
215+
/* On Low speed expansion: LS-SPI0 */
244216
status = "okay";
245-
label = "LS-SPI0";
246217
};
247218

248219
&blsp_uart1 {
@@ -257,50 +228,6 @@
257228

258229
&camss {
259230
status = "okay";
260-
ports {
261-
port@0 {
262-
reg = <0>;
263-
csiphy0_ep: endpoint {
264-
data-lanes = <0 2>;
265-
remote-endpoint = <&ov5640_ep>;
266-
status = "okay";
267-
};
268-
};
269-
};
270-
};
271-
272-
&cci {
273-
status = "okay";
274-
};
275-
276-
&cci_i2c0 {
277-
camera_rear@3b {
278-
compatible = "ovti,ov5640";
279-
reg = <0x3b>;
280-
281-
enable-gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
282-
reset-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
283-
pinctrl-names = "default";
284-
pinctrl-0 = <&camera_rear_default>;
285-
286-
clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
287-
clock-names = "xclk";
288-
clock-frequency = <23880000>;
289-
290-
vdddo-supply = <&camera_vdddo_1v8>;
291-
vdda-supply = <&camera_vdda_2v8>;
292-
vddd-supply = <&camera_vddd_1v5>;
293-
294-
/* No camera mezzanine by default */
295-
status = "disabled";
296-
297-
port {
298-
ov5640_ep: endpoint {
299-
data-lanes = <0 2>;
300-
remote-endpoint = <&csiphy0_ep>;
301-
};
302-
};
303-
};
304231
};
305232

306233
&lpass {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@
366366
function = "gpio";
367367
pins = "gpio107";
368368
bias-pull-up;
369-
input-enable;
370369
};
371370
};
372371

@@ -375,7 +374,6 @@
375374
pinctrl-0 = <&pinctrl_otg_default>;
376375
pinctrl-1 = <&pinctrl_otg_host>;
377376
pinctrl-2 = <&pinctrl_otg_device>;
378-
pin-switch-delay-us = <100000>;
379377
usb-role-switch;
380378
status = "okay";
381379

0 commit comments

Comments
 (0)