Skip to content

Commit 23d3954

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-fixes-for-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm ARM64 DTS fixes for 6.2 The cluster idle issue was resolved on SM8250, so the change disabling the cluster state is being reverted. Issues where identified with the QMP PHY binding, that would prevent enablement of Displayport and it was decided not to support the old binding for the recently introduced SC8280XP, which broke USB. This adjusts the USB PHY nodes to the new binding. The reset signal for the first QMP PHY is corrected as well. The reserved memory map is updated on Xiaomi Mi 4C and Huawei Nexus 6P, to avoid instabilities caused by use of protected memory regions. The compatible for the MSM8992 TCSR mutex is corrected as well. Lastly SDHCI interconnects on SM8350 are corrected to match the providers #interconnect-cells. * tag 'qcom-arm64-fixes-for-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: msm8992-libra: Fix the memory map arm64: dts: qcom: msm8992: Don't use sfpb mutex arm64: dts: msm8994-angler: fix the memory map arm64: dts: qcom: sm8350: correct SDHCI interconnect arguments Revert "arm64: dts: qcom: sm8250: Disable the not yet supported cluster idle state" arm64: dts: msm8992-bullhead: add memory hole region arm64: dts: qcom: sc8280xp: fix USB-DP PHY nodes arm64: dts: qcom: sc8280xp: fix primary USB-DP PHY reset Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 985d7fe + 69876bc commit 23d3954

File tree

7 files changed

+108
-82
lines changed

7 files changed

+108
-82
lines changed

‎arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (c) 2015, LGE Inc. All rights reserved.
44
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
55
* Copyright (c) 2021, Petr Vorel <[email protected]>
6+
* Copyright (c) 2022, Dominik Kobinski <[email protected]>
67
*/
78

89
/dts-v1/;
@@ -51,6 +52,11 @@
5152
reg = <0 0x03400000 0 0x1200000>;
5253
no-map;
5354
};
55+
56+
removed_region: reserved@5000000 {
57+
reg = <0 0x05000000 0 0x2200000>;
58+
no-map;
59+
};
5460
};
5561
};
5662

‎arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts

Lines changed: 60 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
#include <dt-bindings/gpio/gpio.h>
1212
#include <dt-bindings/input/gpio-keys.h>
1313

14+
/delete-node/ &adsp_mem;
15+
/delete-node/ &audio_mem;
16+
/delete-node/ &mpss_mem;
17+
/delete-node/ &peripheral_region;
18+
/delete-node/ &rmtfs_mem;
19+
1420
/ {
1521
model = "Xiaomi Mi 4C";
1622
compatible = "xiaomi,libra", "qcom,msm8992";
@@ -70,25 +76,67 @@
7076
#size-cells = <2>;
7177
ranges;
7278

73-
/* This is for getting crash logs using Android downstream kernels */
74-
ramoops@dfc00000 {
75-
compatible = "ramoops";
76-
reg = <0x0 0xdfc00000 0x0 0x40000>;
77-
console-size = <0x10000>;
78-
record-size = <0x10000>;
79-
ftrace-size = <0x10000>;
80-
pmsg-size = <0x20000>;
79+
memory_hole: hole@6400000 {
80+
reg = <0 0x06400000 0 0x600000>;
81+
no-map;
82+
};
83+
84+
memory_hole2: hole2@6c00000 {
85+
reg = <0 0x06c00000 0 0x2400000>;
86+
no-map;
87+
};
88+
89+
mpss_mem: mpss@9000000 {
90+
reg = <0 0x09000000 0 0x5a00000>;
91+
no-map;
92+
};
93+
94+
tzapp: tzapp@ea00000 {
95+
reg = <0 0x0ea00000 0 0x1900000>;
96+
no-map;
97+
};
98+
99+
mdm_rfsa_mem: mdm-rfsa@ca0b0000 {
100+
reg = <0 0xca0b0000 0 0x10000>;
101+
no-map;
102+
};
103+
104+
rmtfs_mem: rmtfs@ca100000 {
105+
compatible = "qcom,rmtfs-mem";
106+
reg = <0 0xca100000 0 0x180000>;
107+
no-map;
108+
109+
qcom,client-id = <1>;
81110
};
82111

83-
modem_region: modem_region@9000000 {
84-
reg = <0x0 0x9000000 0x0 0x5a00000>;
112+
audio_mem: audio@cb400000 {
113+
reg = <0 0xcb000000 0 0x400000>;
114+
no-mem;
115+
};
116+
117+
qseecom_mem: qseecom@cb400000 {
118+
reg = <0 0xcb400000 0 0x1c00000>;
119+
no-mem;
120+
};
121+
122+
adsp_rfsa_mem: adsp-rfsa@cd000000 {
123+
reg = <0 0xcd000000 0 0x10000>;
85124
no-map;
86125
};
87126

88-
tzapp: modem_region@ea00000 {
89-
reg = <0x0 0xea00000 0x0 0x1900000>;
127+
sensor_rfsa_mem: sensor-rfsa@cd010000 {
128+
reg = <0 0xcd010000 0 0x10000>;
90129
no-map;
91130
};
131+
132+
ramoops@dfc00000 {
133+
compatible = "ramoops";
134+
reg = <0 0xdfc00000 0 0x40000>;
135+
console-size = <0x10000>;
136+
record-size = <0x10000>;
137+
ftrace-size = <0x10000>;
138+
pmsg-size = <0x20000>;
139+
};
92140
};
93141
};
94142

@@ -130,11 +178,6 @@
130178
status = "okay";
131179
};
132180

133-
&peripheral_region {
134-
reg = <0x0 0x7400000 0x0 0x1c00000>;
135-
no-map;
136-
};
137-
138181
&pm8994_spmi_regulators {
139182
VDD_APC0: s8 {
140183
regulator-min-microvolt = <680000>;

‎arch/arm64/boot/dts/qcom/msm8992.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
compatible = "qcom,rpmcc-msm8992", "qcom,rpmcc";
3838
};
3939

40-
&tcsr_mutex {
41-
compatible = "qcom,sfpb-mutex";
42-
};
43-
4440
&timer {
4541
interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
4642
<GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

‎arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
#include "msm8994.dtsi"
1111

12-
/* Angler's firmware does not report where the memory is allocated */
13-
/delete-node/ &cont_splash_mem;
14-
1512
/ {
1613
model = "Huawei Nexus 6P";
1714
compatible = "huawei,angler", "qcom,msm8994";
@@ -28,6 +25,22 @@
2825
chosen {
2926
stdout-path = "serial0:115200n8";
3027
};
28+
29+
reserved-memory {
30+
#address-cells = <2>;
31+
#size-cells = <2>;
32+
ranges;
33+
34+
tzapp_mem: tzapp@4800000 {
35+
reg = <0 0x04800000 0 0x1900000>;
36+
no-map;
37+
};
38+
39+
removed_region: reserved@6300000 {
40+
reg = <0 0x06300000 0 0xD00000>;
41+
no-map;
42+
};
43+
};
3144
};
3245

3346
&blsp1_uart2 {

‎arch/arm64/boot/dts/qcom/sc8280xp.dtsi

Lines changed: 24 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <dt-bindings/interconnect/qcom,sc8280xp.h>
1111
#include <dt-bindings/interrupt-controller/arm-gic.h>
1212
#include <dt-bindings/mailbox/qcom-ipcc.h>
13+
#include <dt-bindings/phy/phy-qcom-qmp.h>
1314
#include <dt-bindings/power/qcom-rpmpd.h>
1415
#include <dt-bindings/soc/qcom,rpmh-rsc.h>
1516
#include <dt-bindings/thermal/thermal.h>
@@ -762,15 +763,15 @@
762763
<0>,
763764
<0>,
764765
<0>,
765-
<&usb_0_ssphy>,
766+
<&usb_0_qmpphy QMP_USB43DP_USB3_PIPE_CLK>,
766767
<0>,
767768
<0>,
768769
<0>,
769770
<0>,
770771
<0>,
771772
<0>,
772773
<0>,
773-
<&usb_1_ssphy>,
774+
<&usb_1_qmpphy QMP_USB43DP_USB3_PIPE_CLK>,
774775
<0>,
775776
<0>,
776777
<0>,
@@ -1673,42 +1674,26 @@
16731674
};
16741675
};
16751676

1676-
usb_0_qmpphy: phy-wrapper@88ec000 {
1677+
usb_0_qmpphy: phy@88eb000 {
16771678
compatible = "qcom,sc8280xp-qmp-usb43dp-phy";
1678-
reg = <0 0x088ec000 0 0x1e4>,
1679-
<0 0x088eb000 0 0x40>,
1680-
<0 0x088ed000 0 0x1c8>;
1681-
#address-cells = <2>;
1682-
#size-cells = <2>;
1683-
ranges;
1679+
reg = <0 0x088eb000 0 0x4000>;
16841680

16851681
clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
1686-
<&rpmhcc RPMH_CXO_CLK>,
16871682
<&gcc GCC_USB4_EUD_CLKREF_CLK>,
1688-
<&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>;
1689-
clock-names = "aux", "ref_clk_src", "ref", "com_aux";
1683+
<&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>,
1684+
<&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
1685+
clock-names = "aux", "ref", "com_aux", "usb3_pipe";
1686+
1687+
power-domains = <&gcc USB30_PRIM_GDSC>;
16901688

16911689
resets = <&gcc GCC_USB3_PHY_PRIM_BCR>,
1692-
<&gcc GCC_USB3_DP_PHY_PRIM_BCR>;
1690+
<&gcc GCC_USB4_DP_PHY_PRIM_BCR>;
16931691
reset-names = "phy", "common";
16941692

1695-
power-domains = <&gcc USB30_PRIM_GDSC>;
1693+
#clock-cells = <1>;
1694+
#phy-cells = <1>;
16961695

16971696
status = "disabled";
1698-
1699-
usb_0_ssphy: usb3-phy@88eb400 {
1700-
reg = <0 0x088eb400 0 0x100>,
1701-
<0 0x088eb600 0 0x3ec>,
1702-
<0 0x088ec400 0 0x364>,
1703-
<0 0x088eba00 0 0x100>,
1704-
<0 0x088ebc00 0 0x3ec>,
1705-
<0 0x088ec200 0 0x18>;
1706-
#phy-cells = <0>;
1707-
#clock-cells = <0>;
1708-
clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
1709-
clock-names = "pipe0";
1710-
clock-output-names = "usb0_phy_pipe_clk_src";
1711-
};
17121697
};
17131698

17141699
usb_1_hsphy: phy@8902000 {
@@ -1725,42 +1710,26 @@
17251710
status = "disabled";
17261711
};
17271712

1728-
usb_1_qmpphy: phy-wrapper@8904000 {
1713+
usb_1_qmpphy: phy@8903000 {
17291714
compatible = "qcom,sc8280xp-qmp-usb43dp-phy";
1730-
reg = <0 0x08904000 0 0x1e4>,
1731-
<0 0x08903000 0 0x40>,
1732-
<0 0x08905000 0 0x1c8>;
1733-
#address-cells = <2>;
1734-
#size-cells = <2>;
1735-
ranges;
1715+
reg = <0 0x08903000 0 0x4000>;
17361716

17371717
clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>,
1738-
<&rpmhcc RPMH_CXO_CLK>,
17391718
<&gcc GCC_USB4_CLKREF_CLK>,
1740-
<&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>;
1741-
clock-names = "aux", "ref_clk_src", "ref", "com_aux";
1719+
<&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>,
1720+
<&gcc GCC_USB3_SEC_PHY_PIPE_CLK>;
1721+
clock-names = "aux", "ref", "com_aux", "usb3_pipe";
1722+
1723+
power-domains = <&gcc USB30_SEC_GDSC>;
17421724

17431725
resets = <&gcc GCC_USB3_PHY_SEC_BCR>,
17441726
<&gcc GCC_USB4_1_DP_PHY_PRIM_BCR>;
17451727
reset-names = "phy", "common";
17461728

1747-
power-domains = <&gcc USB30_SEC_GDSC>;
1729+
#clock-cells = <1>;
1730+
#phy-cells = <1>;
17481731

17491732
status = "disabled";
1750-
1751-
usb_1_ssphy: usb3-phy@8903400 {
1752-
reg = <0 0x08903400 0 0x100>,
1753-
<0 0x08903600 0 0x3ec>,
1754-
<0 0x08904400 0 0x364>,
1755-
<0 0x08903a00 0 0x100>,
1756-
<0 0x08903c00 0 0x3ec>,
1757-
<0 0x08904200 0 0x18>;
1758-
#phy-cells = <0>;
1759-
#clock-cells = <0>;
1760-
clocks = <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>;
1761-
clock-names = "pipe0";
1762-
clock-output-names = "usb1_phy_pipe_clk_src";
1763-
};
17641733
};
17651734

17661735
pmu@9091000 {
@@ -1910,7 +1879,7 @@
19101879
reg = <0 0x0a600000 0 0xcd00>;
19111880
interrupts = <GIC_SPI 803 IRQ_TYPE_LEVEL_HIGH>;
19121881
iommus = <&apps_smmu 0x820 0x0>;
1913-
phys = <&usb_0_hsphy>, <&usb_0_ssphy>;
1882+
phys = <&usb_0_hsphy>, <&usb_0_qmpphy QMP_USB43DP_USB3_PHY>;
19141883
phy-names = "usb2-phy", "usb3-phy";
19151884
};
19161885
};
@@ -1964,7 +1933,7 @@
19641933
reg = <0 0x0a800000 0 0xcd00>;
19651934
interrupts = <GIC_SPI 810 IRQ_TYPE_LEVEL_HIGH>;
19661935
iommus = <&apps_smmu 0x860 0x0>;
1967-
phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
1936+
phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
19681937
phy-names = "usb2-phy", "usb3-phy";
19691938
};
19701939
};

‎arch/arm64/boot/dts/qcom/sm8250.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@
334334
exit-latency-us = <6562>;
335335
min-residency-us = <9987>;
336336
local-timer-stop;
337-
status = "disabled";
338337
};
339338
};
340339
};

‎arch/arm64/boot/dts/qcom/sm8350.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,8 +2382,8 @@
23822382
<&rpmhcc RPMH_CXO_CLK>;
23832383
clock-names = "iface", "core", "xo";
23842384
resets = <&gcc GCC_SDCC2_BCR>;
2385-
interconnects = <&aggre2_noc MASTER_SDCC_2 0 &mc_virt SLAVE_EBI1 0>,
2386-
<&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_SDCC_2 0>;
2385+
interconnects = <&aggre2_noc MASTER_SDCC_2 &mc_virt SLAVE_EBI1>,
2386+
<&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_SDCC_2>;
23872387
interconnect-names = "sdhc-ddr","cpu-sdhc";
23882388
iommus = <&apps_smmu 0x4a0 0x0>;
23892389
power-domains = <&rpmhpd SM8350_CX>;

0 commit comments

Comments
 (0)