Skip to content

Commit 10678a0

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM64 updates for v6.4 PCI I/O and MEM ranges are corrected across all targets with PCIe enabled. Likewise is CPU clocks defined to be provided from CPUfreq for a wide range of platforms, to satisfy the OPP definitions, and LLCC bank information is corrected for all relevant platforms. IPQ5332 gains SMEM, CPUfreq and support for triggering download mode. The MI01.2 board is introduced. On MSM8916 WCN compatibles are moved to be defined per board, to avoid issues when boards rely on the incorrect defaults. Support for Yiming UZ801 4G modem stick is introduced. XO clock is defined and fed to RPMCC on MSM8953 and MSM8976, to ensure clock trees are properly rooted. DSI clocks feeding into gcc are described on MSM8953. On MSM8996 the external audio components are moved from the SoC dtsi. A few DWC3 quirks are added. On MSM8998 GPIO names are introduced for Sony Xperia XZ Premium, XZ1 and XZ1 Compact. A numbe of boards have GPIO keys properly marked as wakeup-source. The SA8775P platform is extended with CPUfreq, UARTs, I2C controllers, SPI controllers, SPMI and PMICs, PDC support. The associated PMICs gains reset and power key support, as well as thermal zones defined. Nodes are sorted. On top of this the SA8775P Ride board/platform is introduced. On SC7180 and SC7280 a range of fixes coming from DeviceTree validation are introduced, some clearing up unused properties, others correcting errors. A number of Google rev0 boards on SC7180 are dropped, as these are not considered to be in use by anyone anymore. On SC8280XP RTC support is introduced and enabled for the CRD and Lenovo Thinkpad X13s. It gains another UART, upon which Bluetooth is enabled on the Lenovo ThinkPad X13s. The touchpad definition is altered to attempt to probe both devices seen in the wild. A number of bug fixes are also introduced, and the regulator definitions on X13s are corrected. On SDM845 dynamic power coefficients are improved. BWMON compatible is corrected. Xiaomi Pocophone F1 gains notification LED. Sony Xperia XZ2, XZ2 Compact and XZ3 gains display, touchscreen, gpu and remoteproc support. OnePlus 6 and 6T gains hall sensor. GPU clock controller and remoteproc nodes are added for SM6115. CPU clock are defined to come from CPUfreq. Board-specific USB-properties are moved out of the SoC dtsi. On SM6375 L3 scaling, IMEM, RMTFS, RPM sleep stats, Tsens, modem remoteproc and WiFi nodes are added. Tsens thermal zones are defined and additional low power states are defined. Sony Xperia 10 IV gains volume down key support. On SM8150 another UART is introduced, to be used by GNSS on the SA8155 ADP. Support for the Flash LED block in PM8150L is added. On SM8250 TPDM MM and PRNG is defined, MHI region is added to PCIe node. A few bug fixes are introduced after Devicetree validation. The DisplayPort controller on both SM8350 and SM8450 is defined and the related QMP instance is transitioned to the USB3/DP combo variant. IMEM and PIL info is introduced, for post mortem debugging of remoteprocs. On the HDK PMIC GLINK is enabled and role switch is enabled. Some audio resources are corrected. A typo in the USB role property of the Microsoft Surface is corrected, thanks to DeviceTree validation. PCIe controllers and PHYs descriptions are corrected, and pinctrl state definitions are moved from the soc to the board definition. BWMON compatibles are corrected. PM8550B gains the definition of the eUSB2 repeater and this is enabled on the MTP. PMIC GLINK is also defined for the MTP and connected to DWC3, for role switching support. In addition to this, a range of cleanups based on Devicetree validation is introduced. A few clock bindings are introduced, from topic-branches shared with the clock tree, to aid introduction of references to these. * tag 'qcom-arm64-for-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (256 commits) arm64: dts: qcom: sc8280xp-x13s: Add bluetooth arm64: dts: qcom: sc8280xp: Define uart2 arm64: dts: qcom: sc8280xp: Add "mhi" region to the PCIe nodes arm64: dts: qcom: sm8250: Add "mhi" region to the PCIe nodes arm64: dts: qcom: sdm845: Add "mhi" region to the PCIe nodes arm64: dts: qcom: sa8775p-ride: set gpio-line-names for PMIC GPIOs arm64: dts: qcom: sa8775p: add PMIC GPIO controller nodes arm64: dts: qcom: sa8775p: pmic: add thermal zones arm64: dts: qcom: sa8775p: pmic: add support for the pmm8654 RESIN input arm64: dts: qcom: sa8775p: pmic: add the power key arm64: dts: qcom: sa8775p: add the Power On device node arm64: dts: qcom: sa8775p: add support for the on-board PMICs arm64: dts: qcom: sa8775p: add the spmi node arm64: dts: qcom: sa8775p: add the pdc node arm64: dts: qcom: sa8775p: sort soc nodes by reg property arm64: dts: qcom: sa8775p: pad reg properties to 8 digits arm64: dts: qcom: sc8280xp: correct Soundwire wakeup interrupt name arm64: dts: qcom: sdm845-tama: Enable GPI_DMA0/1 arm64: dts: qcom: sdm845-tama: Enable GPU arm64: dts: qcom: sdm845-tama: Enable remoteprocs ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents a8127d2 + 105560b commit 10678a0

File tree

145 files changed

+6597
-1431
lines changed

Some content is hidden

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

145 files changed

+6597
-1431
lines changed

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
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,ipq5332-gcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller on IPQ5332
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
12+
description: |
13+
Qualcomm global clock control module provides the clocks, resets and power
14+
domains on IPQ5332.
15+
16+
See also:: include/dt-bindings/clock/qcom,gcc-ipq5332.h
17+
18+
allOf:
19+
- $ref: qcom,gcc.yaml#
20+
21+
properties:
22+
compatible:
23+
const: qcom,ipq5332-gcc
24+
25+
clocks:
26+
items:
27+
- description: Board XO clock source
28+
- description: Sleep clock source
29+
- description: PCIE 2lane PHY pipe clock source
30+
- description: PCIE 2lane x1 PHY pipe clock source (For second lane)
31+
- description: USB PCIE wrapper pipe clock source
32+
33+
required:
34+
- compatible
35+
- clocks
36+
37+
unevaluatedProperties: false
38+
39+
examples:
40+
- |
41+
clock-controller@1800000 {
42+
compatible = "qcom,ipq5332-gcc";
43+
reg = <0x01800000 0x80000>;
44+
clocks = <&xo_board>,
45+
<&sleep_clk>,
46+
<&pcie_2lane_phy_pipe_clk>,
47+
<&pcie_2lane_phy_pipe_clk_x1>,
48+
<&usb_pcie_wrapper_pipe_clk>;
49+
#clock-cells = <1>;
50+
#power-domain-cells = <1>;
51+
#reset-cells = <1>;
52+
};
53+
...

‎Documentation/devicetree/bindings/clock/qcom,sm6115-gpucc.yaml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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,sm6115-gpucc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Graphics Clock & Reset Controller on SM6115
8+
9+
maintainers:
10+
- Konrad Dybcio <[email protected]>
11+
12+
description: |
13+
Qualcomm graphics clock control module provides clocks, resets and power
14+
domains on Qualcomm SoCs.
15+
16+
See also:: include/dt-bindings/clock/qcom,sm6115-gpucc.h
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- qcom,sm6115-gpucc
22+
23+
clocks:
24+
items:
25+
- description: Board XO source
26+
- description: GPLL0 main branch source
27+
- description: GPLL0 main div source
28+
29+
required:
30+
- compatible
31+
- clocks
32+
33+
allOf:
34+
- $ref: qcom,gcc.yaml#
35+
36+
unevaluatedProperties: false
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/clock/qcom,gcc-sm6115.h>
41+
#include <dt-bindings/clock/qcom,rpmcc.h>
42+
43+
soc {
44+
#address-cells = <1>;
45+
#size-cells = <1>;
46+
47+
clock-controller@5990000 {
48+
compatible = "qcom,sm6115-gpucc";
49+
reg = <0x05990000 0x9000>;
50+
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
51+
<&gcc GCC_GPU_GPLL0_CLK_SRC>,
52+
<&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
53+
#clock-cells = <1>;
54+
#reset-cells = <1>;
55+
#power-domain-cells = <1>;
56+
};
57+
};
58+
...

‎Documentation/devicetree/bindings/clock/qcom,sm6125-gpucc.yaml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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,sm6125-gpucc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Graphics Clock & Reset Controller on SM6125
8+
9+
maintainers:
10+
- Konrad Dybcio <[email protected]>
11+
12+
description: |
13+
Qualcomm graphics clock control module provides clocks and power domains on
14+
Qualcomm SoCs.
15+
16+
See also:: include/dt-bindings/clock/qcom,sm6125-gpucc.h
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- qcom,sm6125-gpucc
22+
23+
clocks:
24+
items:
25+
- description: Board XO source
26+
- description: GPLL0 main branch source
27+
28+
'#clock-cells':
29+
const: 1
30+
31+
'#power-domain-cells':
32+
const: 1
33+
34+
reg:
35+
maxItems: 1
36+
37+
required:
38+
- compatible
39+
- reg
40+
- clocks
41+
- '#clock-cells'
42+
- '#power-domain-cells'
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
#include <dt-bindings/clock/qcom,gcc-sm6125.h>
49+
#include <dt-bindings/clock/qcom,rpmcc.h>
50+
51+
soc {
52+
#address-cells = <1>;
53+
#size-cells = <1>;
54+
55+
clock-controller@5990000 {
56+
compatible = "qcom,sm6125-gpucc";
57+
reg = <0x05990000 0x9000>;
58+
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
59+
<&gcc GCC_GPU_GPLL0_CLK_SRC>;
60+
#clock-cells = <1>;
61+
#power-domain-cells = <1>;
62+
};
63+
};
64+
...

‎Documentation/devicetree/bindings/clock/qcom,sm6375-gpucc.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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,sm6375-gpucc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Graphics Clock & Reset Controller on SM6375
8+
9+
maintainers:
10+
- Konrad Dybcio <[email protected]>
11+
12+
description: |
13+
Qualcomm graphics clock control module provides clocks, resets and power
14+
domains on Qualcomm SoCs.
15+
16+
See also:: include/dt-bindings/clock/qcom,sm6375-gpucc.h
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- qcom,sm6375-gpucc
22+
23+
clocks:
24+
items:
25+
- description: Board XO source
26+
- description: GPLL0 main branch source
27+
- description: GPLL0 div branch source
28+
- description: SNoC DVM GFX source
29+
30+
required:
31+
- compatible
32+
- clocks
33+
34+
allOf:
35+
- $ref: qcom,gcc.yaml#
36+
37+
unevaluatedProperties: false
38+
39+
examples:
40+
- |
41+
#include <dt-bindings/clock/qcom,sm6375-gcc.h>
42+
#include <dt-bindings/clock/qcom,rpmcc.h>
43+
44+
soc {
45+
#address-cells = <2>;
46+
#size-cells = <2>;
47+
48+
clock-controller@5990000 {
49+
compatible = "qcom,sm6375-gpucc";
50+
reg = <0 0x05990000 0 0x9000>;
51+
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
52+
<&gcc GCC_GPU_GPLL0_CLK_SRC>,
53+
<&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>,
54+
<&gcc GCC_GPU_SNOC_DVM_GFX_CLK>;
55+
#clock-cells = <1>;
56+
#reset-cells = <1>;
57+
#power-domain-cells = <1>;
58+
};
59+
};
60+
...

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb
33
dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb
44
dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb
55
dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb
6+
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-mi01.2.dtb
67
dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb
78
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
89
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
@@ -28,6 +29,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb
2829
dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb
2930
dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb
3031
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
32+
dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb
3133
dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb
3234
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb
3335
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-mido.dtb
@@ -75,6 +77,7 @@ dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb
7577
dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb
7678
dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb
7779
dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb
80+
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb
7881
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
7982
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb
8083
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb
@@ -83,9 +86,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3-lte.dtb
8386
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r2.dtb
8487
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r3.dtb
8588
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r4.dtb
86-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-kingoftown-r0.dtb
87-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-kingoftown-r1.dtb
88-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r0.dtb
89+
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-kingoftown.dtb
8990
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1.dtb
9091
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-kb.dtb
9192
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-lte.dtb
@@ -100,10 +101,6 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb
100101
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb
101102
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb
102103
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb
103-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-mrbland-rev0-auo.dtb
104-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-mrbland-rev0-boe.dtb
105-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-mrbland-rev1-auo.dtb
106-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-mrbland-rev1-boe.dtb
107104
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb
108105
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb
109106
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb
@@ -118,8 +115,6 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3.dtb
118115
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3-lte.dtb
119116
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-quackingstick-r0.dtb
120117
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-quackingstick-r0-lte.dtb
121-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev0-boe.dtb
122-
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev0-inx.dtb
123118
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe.dtb
124119
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-inx.dtb
125120
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dtb
@@ -200,3 +195,4 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8450-qrd.dtb
200195
dtb-$(CONFIG_ARCH_QCOM) += sm8450-sony-xperia-nagara-pdx223.dtb
201196
dtb-$(CONFIG_ARCH_QCOM) += sm8450-sony-xperia-nagara-pdx224.dtb
202197
dtb-$(CONFIG_ARCH_QCOM) += sm8550-mtp.dtb
198+
dtb-$(CONFIG_ARCH_QCOM) += sm8550-qrd.dtb

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,6 @@
325325
linux,code = <KEY_VOLUMEDOWN>;
326326
};
327327

328-
&pronto {
329-
status = "okay";
330-
331-
firmware-name = "qcom/apq8016/wcnss.mbn";
332-
};
333-
334328
&sdhc_1 {
335329
status = "okay";
336330

@@ -411,10 +405,19 @@
411405
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
412406
};
413407

408+
&wcnss {
409+
status = "okay";
410+
firmware-name = "qcom/apq8016/wcnss.mbn";
411+
};
412+
414413
&wcnss_ctrl {
415414
firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin";
416415
};
417416

417+
&wcnss_iris {
418+
compatible = "qcom,wcn3620";
419+
};
420+
418421
/* Enable CoreSight */
419422
&cti0 { status = "okay"; };
420423
&cti1 { status = "okay"; };

0 commit comments

Comments
 (0)