Skip to content

Commit 055fdca

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-6.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
More Qualcomm ARM64 DTS changes for v6.5 This introduces support for the Qualcomm SDX75 platform, with the IDP reference board. On IPQ5332 the RDP474 board is added and on IPQ9574 the RDP454 is introduced. On SC8280XP, and hence Lenovo ThinkPad X13s, GPU support is added. For QDU1000, SDM845, SM670, SC8180X, SM6350 and SM8550 the RSC is added to the CPU cluster power-domain to flush sleep & wake votes as the cluster goes down. On IPQ5332 additional reserved-memory regions to improve post mortem debugging. UART1 is added. The MI01.2 board is renamed RDP441 and the RDP474 is added. On IPQ8074 critical thermal trip points are defined. As with IPQ5332 additional reserved-memory regions are used to improve post mortem debugging. Thermal sensors (tsens) are added and zones defined. The crypto engine is added, and support for the RDP454 board is added. Across MSM8916 and MSM8939 pinctrl state definitions are cleaned up and the purpose of msm8939-pm8916 is documented. MSM8939 has regulator definitions cleaned up, following to the previous effort on MSM8916. CPU Bus Fabric scaling support is added to MSM8996 Pro. On QCM2290 CPU idle states are added. For QDU1000 SDHCI is introduced and enabled on the IDP to gain eMMC support. IMEM and PIL information regions are defined for improved post mortem debugging. The Qualcomm Robotics RB2 kit gets its on-board buttons described. A few fixes are introduced for the newly merged SC8180X, in particluar the DisplayPort blocks are moved to the MMCX power domain to avoid power being reduced prematurely during boot. The SC8280XP GPU is added and enabled for the Lenovo Thinkpad X13s, and resets for the soundwire controllers are added. The OUI is specified for ethernet phys on SA8540P Ride platform, to avoid reset issues. Charger description is added to the PMI8998 PMIC and enabled across OnePlus 6/6T, SHIFT SHIFT6mq and Xiaomi Pocophone F1. On SM6350 CPU idle states and UART1 are added. And SM6375 gains GPU clock controller and IOMMU definitions. The Fairphone FP4 gains Bluetooth support. SM8150 is transitioned to use 2 interconnect-cells, and the USB interconnect path is described to ensure buses are adequately voted for. The same changes are done for SM8250, and the resolution of the static framebuffer on Sony Xperia 1 II and 5 II are corrected. The USB bus paths are also added to SM8350, SM8450 and SM8550. On SM8550 DisplayPort nodes are added, as is the PWM controller for driving the notification LED and the RTC is enabled. For the MTP and QRD boards, the soundcard and audio codecs are defined. A Tegra change, related to LP855X binding changes, was accidentally picked up and dropped again later. A number of DeviceTree fixes identified through validation was introduced as well. Additionally a few nodes got their default status changed to avoid unnecessarily having to enable them (e.g. the mdp/dpu node). * tag 'qcom-arm64-for-6.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (94 commits) Revert "arm64: dts: adapt to LP855X bindings changes" arm64: dts: qcom: sc8280xp: Enable GPU related nodes arm64: dts: qcom: sc8280xp: Add GPU related nodes arm64: dts: qcom: msm8939-pm8916: Mark always-on regulators arm64: dts: qcom: msm8939: Define regulator constraints next to usage arm64: dts: qcom: msm8939-pm8916: Clarify purpose arm64: dts: qcom: msm8939: Fix regulator constraints arm64: dts: qcom: msm8939-sony-tulip: Allow disabling pm8916_l6 arm64: dts: qcom: msm8939-sony-tulip: Fix l10-l12 regulator voltages arm64: dts: qcom: msm8939: Disable lpass_codec by default arm64: dts: qcom: msm8939-pm8916: Add missing pm8916_codec supplies arm64: dts: qcom: qrb4210-rb2: Enable on-board buttons arm64: dts: qcom: msm8916: Drop msm8916-pins.dtsi arm64: dts: qcom: msm8916/39: Rename wcnss pinctrl arm64: dts: qcom: msm8916/39: Cleanup audio pinctrl arm64: dts: qcom: apq8016-sbc: Drop unneeded MCLK pinctrl arm64: dts: qcom: msm8916/39: Consolidate SDC pinctrl arm64: dts: qcom: msm8916/39: Fix SD card detect pinctrl arm64: dts: qcom: msm8996: rename labels for HDMI nodes arm64: dts: qcom: sm8250: rename labels for DSI nodes ... Link: https://lore.kernel.org/r/20230615162043.1461624-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents af3c684 + c295158 commit 055fdca

104 files changed

Lines changed: 4545 additions & 1835 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: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ description: |
7070
sdm845
7171
sdx55
7272
sdx65
73+
sdx75
7374
sm4250
7475
sm6115
7576
sm6115p
@@ -90,9 +91,11 @@ description: |
9091
ap-al02-c6
9192
ap-al02-c7
9293
ap-al02-c8
94+
ap-al02-c9
9395
ap-mi01.2
9496
ap-mi01.3
9597
ap-mi01.6
98+
ap-mi01.9
9699
cdp
97100
cp01-c1
98101
dragonboard
@@ -196,6 +199,7 @@ properties:
196199
- items:
197200
- enum:
198201
- qcom,msm8960-cdp
202+
- samsung,expressatt
199203
- const: qcom,msm8960
200204

201205
- items:
@@ -340,6 +344,7 @@ properties:
340344
- qcom,ipq5332-ap-mi01.2
341345
- qcom,ipq5332-ap-mi01.3
342346
- qcom,ipq5332-ap-mi01.6
347+
- qcom,ipq5332-ap-mi01.9
343348
- const: qcom,ipq5332
344349

345350
- items:
@@ -361,6 +366,7 @@ properties:
361366
- qcom,ipq9574-ap-al02-c6
362367
- qcom,ipq9574-ap-al02-c7
363368
- qcom,ipq9574-ap-al02-c8
369+
- qcom,ipq9574-ap-al02-c9
364370
- const: qcom,ipq9574
365371

366372
- description: Sierra Wireless MangOH Green with WP8548 Module
@@ -828,6 +834,11 @@ properties:
828834
- qcom,sdx65-mtp
829835
- const: qcom,sdx65
830836

837+
- items:
838+
- enum:
839+
- qcom,sdx75-idp
840+
- const: qcom,sdx75
841+
831842
- items:
832843
- enum:
833844
- qcom,ipq6018-cp01
@@ -1056,6 +1067,7 @@ allOf:
10561067
- qcom,sdm845
10571068
- qcom,sdx55
10581069
- qcom,sdx65
1070+
- qcom,sdx75
10591071
- qcom,sm4250
10601072
- qcom,sm6115
10611073
- qcom,sm6125

‎Documentation/devicetree/bindings/clock/qcom,sc8280xp-lpasscc.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,sc8280xp-lpasscc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm LPASS Core & Audio Clock Controller on SC8280XP
8+
9+
maintainers:
10+
- Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
11+
12+
description: |
13+
Qualcomm LPASS core and audio clock control module provides the clocks,
14+
and reset on SC8280XP.
15+
16+
See also::
17+
include/dt-bindings/clock/qcom,lpasscc-sc8280xp.h
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- qcom,sc8280xp-lpassaudiocc
23+
- qcom,sc8280xp-lpasscc
24+
25+
reg:
26+
maxItems: 1
27+
28+
'#clock-cells':
29+
const: 1
30+
31+
'#reset-cells':
32+
const: 1
33+
34+
required:
35+
- compatible
36+
- reg
37+
- '#clock-cells'
38+
- '#reset-cells'
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
#include <dt-bindings/clock/qcom,sc8280xp-lpasscc.h>
45+
lpass_audiocc: clock-controller@32a9000 {
46+
compatible = "qcom,sc8280xp-lpassaudiocc";
47+
reg = <0x032a9000 0x1000>;
48+
#clock-cells = <1>;
49+
#reset-cells = <1>;
50+
};
51+
52+
- |
53+
#include <dt-bindings/clock/qcom,sc8280xp-lpasscc.h>
54+
lpasscc: clock-controller@33e0000 {
55+
compatible = "qcom,sc8280xp-lpasscc";
56+
reg = <0x033e0000 0x12000>;
57+
#clock-cells = <1>;
58+
#reset-cells = <1>;
59+
};
60+
...

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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,sdx75-gcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller on SDX75
8+
9+
maintainers:
10+
- Imran Shaik <quic_imrashai@quicinc.com>
11+
- Taniya Das <quic_tdas@quicinc.com>
12+
13+
description: |
14+
Qualcomm global clock control module provides the clocks, resets and power
15+
domains on SDX75
16+
17+
See also:: include/dt-bindings/clock/qcom,sdx75-gcc.h
18+
19+
properties:
20+
compatible:
21+
const: qcom,sdx75-gcc
22+
23+
clocks:
24+
items:
25+
- description: Board XO source
26+
- description: Sleep clock source
27+
- description: EMAC0 sgmiiphy mac rclk source
28+
- description: EMAC0 sgmiiphy mac tclk source
29+
- description: EMAC0 sgmiiphy rclk source
30+
- description: EMAC0 sgmiiphy tclk source
31+
- description: EMAC1 sgmiiphy mac rclk source
32+
- description: EMAC1 sgmiiphy mac tclk source
33+
- description: EMAC1 sgmiiphy rclk source
34+
- description: EMAC1 sgmiiphy tclk source
35+
- description: PCIE20 phy aux clock source
36+
- description: PCIE_1 Pipe clock source
37+
- description: PCIE_2 Pipe clock source
38+
- description: PCIE Pipe clock source
39+
- description: USB3 phy wrapper pipe clock source
40+
41+
required:
42+
- compatible
43+
- clocks
44+
45+
allOf:
46+
- $ref: qcom,gcc.yaml#
47+
48+
unevaluatedProperties: false
49+
50+
examples:
51+
- |
52+
#include <dt-bindings/clock/qcom,rpmh.h>
53+
clock-controller@80000 {
54+
compatible = "qcom,sdx75-gcc";
55+
reg = <0x80000 0x1f7400>;
56+
clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>, <&emac0_sgmiiphy_mac_rclk>,
57+
<&emac0_sgmiiphy_mac_tclk>, <&emac0_sgmiiphy_rclk>, <&emac0_sgmiiphy_tclk>,
58+
<&emac1_sgmiiphy_mac_rclk>, <&emac1_sgmiiphy_mac_tclk>, <&emac1_sgmiiphy_rclk>,
59+
<&emac1_sgmiiphy_tclk>, <&pcie20_phy_aux_clk>, <&pcie_1_pipe_clk>,
60+
<&pcie_2_pipe_clk>, <&pcie_pipe_clk>, <&usb3_phy_wrapper_gcc_usb30_pipe_clk>;
61+
#clock-cells = <1>;
62+
#reset-cells = <1>;
63+
#power-domain-cells = <1>;
64+
};
65+
...

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.dtb
44
dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb
55
dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb
66
dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb
7-
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-mi01.2.dtb
7+
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp441.dtb
88
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp442.dtb
99
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp468.dtb
10+
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp474.dtb
1011
dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb
1112
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
1213
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
@@ -15,6 +16,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp418.dtb
1516
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
1617
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb
1718
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb
19+
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp454.dtb
1820
dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb
1921
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
2022
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
@@ -182,6 +184,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-xiaomi-polaris.dtb
182184
dtb-$(CONFIG_ARCH_QCOM) += sdm845-shift-axolotl.dtb
183185
dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb
184186
dtb-$(CONFIG_ARCH_QCOM) += sdm850-samsung-w737.dtb
187+
dtb-$(CONFIG_ARCH_QCOM) += sdx75-idp.dtb
185188
dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb
186189
dtb-$(CONFIG_ARCH_QCOM) += sm6115-fxtec-pro1x.dtb
187190
dtb-$(CONFIG_ARCH_QCOM) += sm6115p-lenovo-j606f.dtb

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -370,27 +370,23 @@
370370

371371
&sdhc_1 {
372372
status = "okay";
373-
374-
pinctrl-names = "default", "sleep";
375-
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
376-
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
377373
};
378374

379375
&sdhc_2 {
380376
status = "okay";
381377

382378
pinctrl-names = "default", "sleep";
383-
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
384-
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
379+
pinctrl-0 = <&sdc2_default &sdc2_cd_default>;
380+
pinctrl-1 = <&sdc2_sleep &sdc2_cd_default>;
385381

386382
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
387383
};
388384

389385
&sound {
390386
status = "okay";
391387

392-
pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;
393-
pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
388+
pinctrl-0 = <&cdc_pdm_default &sec_mi2s_default>;
389+
pinctrl-1 = <&cdc_pdm_sleep &sec_mi2s_sleep>;
394390
pinctrl-names = "default", "sleep";
395391
model = "DB410c";
396392
audio-routing =
@@ -642,6 +638,13 @@
642638
"USR_LED_2_CTRL", /* GPIO 120 */
643639
"SB_HS_ID";
644640

641+
sdc2_cd_default: sdc2-cd-default-state {
642+
pins = "gpio38";
643+
function = "gpio";
644+
drive-strength = <2>;
645+
bias-disable;
646+
};
647+
645648
tlmm_leds: tlmm-leds-state {
646649
pins = "gpio21", "gpio120";
647650
function = "gpio";

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

Lines changed: 6 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@
135135
status = "okay";
136136
};
137137

138+
&lpass_codec {
139+
status = "okay";
140+
};
141+
138142
&mdss {
139143
status = "okay";
140144
};
@@ -154,117 +158,16 @@
154158
"PM_GPIO4";
155159
};
156160

157-
&smd_rpm_regulators {
158-
vdd_l1_l2_l3-supply = <&pm8916_s3>;
159-
vdd_l4_l5_l6-supply = <&pm8916_s4>;
160-
vdd_l7-supply = <&pm8916_s4>;
161-
162-
pm8916_s3: s3 {
163-
regulator-min-microvolt = <1200000>;
164-
regulator-max-microvolt = <1300000>;
165-
};
166-
167-
pm8916_s4: s4 {
168-
regulator-min-microvolt = <1800000>;
169-
regulator-max-microvolt = <2100000>;
170-
};
171-
172-
/* l1 is fixed to 1225000, but not connected in schematic */
173-
174-
pm8916_l2: l2 {
175-
regulator-min-microvolt = <1200000>;
176-
regulator-max-microvolt = <1200000>;
177-
};
178-
179-
pm8916_l4: l4 {
180-
regulator-min-microvolt = <2050000>;
181-
regulator-max-microvolt = <2050000>;
182-
};
183-
184-
pm8916_l5: l5 {
185-
regulator-min-microvolt = <1800000>;
186-
regulator-max-microvolt = <1800000>;
187-
};
188-
189-
pm8916_l6: l6 {
190-
regulator-min-microvolt = <1800000>;
191-
regulator-max-microvolt = <1800000>;
192-
};
193-
194-
pm8916_l7: l7 {
195-
regulator-min-microvolt = <1800000>;
196-
regulator-max-microvolt = <1800000>;
197-
};
198-
199-
pm8916_l8: l8 {
200-
regulator-min-microvolt = <2850000>;
201-
regulator-max-microvolt = <2900000>;
202-
};
203-
204-
pm8916_l9: l9 {
205-
regulator-min-microvolt = <3300000>;
206-
regulator-max-microvolt = <3300000>;
207-
};
208-
209-
pm8916_l10: l10 {
210-
regulator-min-microvolt = <3300000>;
211-
regulator-max-microvolt = <3300000>;
212-
};
213-
214-
pm8916_l11: l11 {
215-
regulator-min-microvolt = <1800000>;
216-
regulator-max-microvolt = <2950000>;
217-
};
218-
219-
pm8916_l12: l12 {
220-
regulator-min-microvolt = <1800000>;
221-
regulator-max-microvolt = <2950000>;
222-
};
223-
224-
pm8916_l13: l13 {
225-
regulator-min-microvolt = <3075000>;
226-
regulator-max-microvolt = <3075000>;
227-
};
228-
229-
pm8916_l14: l14 {
230-
regulator-min-microvolt = <1800000>;
231-
regulator-max-microvolt = <3300000>;
232-
};
233-
234-
pm8916_l15: l15 {
235-
regulator-min-microvolt = <1800000>;
236-
regulator-max-microvolt = <3300000>;
237-
};
238-
239-
pm8916_l16: l16 {
240-
regulator-min-microvolt = <1800000>;
241-
regulator-max-microvolt = <3300000>;
242-
};
243-
244-
pm8916_l17: l17 {
245-
regulator-min-microvolt = <2850000>;
246-
regulator-max-microvolt = <2850000>;
247-
};
248-
249-
pm8916_l18: l18 {
250-
regulator-min-microvolt = <2700000>;
251-
regulator-max-microvolt = <2700000>;
252-
};
253-
};
254-
255161
&sdhc_1 {
256-
pinctrl-names = "default", "sleep";
257-
pinctrl-0 = <&sdc1_default_state>;
258-
pinctrl-1 = <&sdc1_sleep_state>;
259162
status = "okay";
260163
};
261164

262165
&sound {
263166
model = "apq8039-square-sndcard";
264167
audio-routing = "AMIC2", "MIC BIAS Internal2";
265168
pinctrl-names = "default", "sleep";
266-
pinctrl-0 = <&cdc_pdm_lines_default>;
267-
pinctrl-1 = <&cdc_pdm_lines_sleep>;
169+
pinctrl-0 = <&cdc_pdm_default>;
170+
pinctrl-1 = <&cdc_pdm_sleep>;
268171

269172
internal-codec-playback-dai-link {
270173
link-name = "WCD";

0 commit comments

Comments
 (0)