Skip to content

Commit 3c78dbf

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-fixes-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm ARM64 fixes for v6.5 This corrects the invalid path specifier for L3 interconnects in the CPU nodes of SM8150 and SM8250. It corrects the compatible of the SC8180X L3 node, to pass the binding check. The crypto core, and its DMA controller, is disabled on SM8350 to avoid the system from crashing at boot while the issue is diagnosed. A thermal zone node name conflict is resolved for PM8150L, on the RB5 board. The UFS vccq voltage is corrected on the SA877P Ride platform, to address observed stability issues. The reg-names of the DSI phy on SC7180 are restored after an accidental search-and-replace update. * tag 'qcom-arm64-fixes-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sc7180: Fix DSI0_PHY reg-names arm64: dts: qcom: sa8775p-ride: Update L4C parameters arm64: dts: qcom: qrb5165-rb5: fix thermal zone conflict arm64: dts: qcom: sm8350: fix BAM DMA crash and reboot arm64: dts: qcom: sc8180x: Fix OSM L3 compatible arm64: dts: qcom: sm8250: Fix EPSS L3 interconnect cells arm64: dts: qcom: sm8150: Fix OSM L3 interconnect cells Link: https://lore.kernel.org/r/20230815142042.2459048-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 17fd01a + 6d4cc57 commit 3c78dbf

7 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎arch/arm64/boot/dts/qcom/qrb5165-rb5.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
};
122122
};
123123

124-
pm8150l-thermal {
124+
pm8150l-pcb-thermal {
125125
polling-delay-passive = <0>;
126126
polling-delay = <0>;
127127
thermal-sensors = <&pm8150l_adc_tm 1>;

‎arch/arm64/boot/dts/qcom/sa8775p-ride.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@
153153

154154
vreg_l4c: ldo4 {
155155
regulator-name = "vreg_l4c";
156-
regulator-min-microvolt = <1100000>;
157-
regulator-max-microvolt = <1300000>;
156+
regulator-min-microvolt = <1200000>;
157+
regulator-max-microvolt = <1200000>;
158158
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
159159
/*
160160
* FIXME: This should have regulator-allow-set-load but

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3120,8 +3120,8 @@
31203120
reg = <0 0x0ae94400 0 0x200>,
31213121
<0 0x0ae94600 0 0x280>,
31223122
<0 0x0ae94a00 0 0x1e0>;
3123-
reg-names = "dsi0_phy",
3124-
"dsi0_phy_lane",
3123+
reg-names = "dsi_phy",
3124+
"dsi_phy_lane",
31253125
"dsi_pll";
31263126

31273127
#clock-cells = <1>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3561,7 +3561,7 @@
35613561
};
35623562

35633563
osm_l3: interconnect@18321000 {
3564-
compatible = "qcom,sc8180x-osm-l3";
3564+
compatible = "qcom,sc8180x-osm-l3", "qcom,osm-l3";
35653565
reg = <0 0x18321000 0 0x1400>;
35663566

35673567
clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
qcom,freq-domain = <&cpufreq_hw 0>;
5757
operating-points-v2 = <&cpu0_opp_table>;
5858
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
59-
<&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>;
59+
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
6060
power-domains = <&CPU_PD0>;
6161
power-domain-names = "psci";
6262
#cooling-cells = <2>;
@@ -85,7 +85,7 @@
8585
qcom,freq-domain = <&cpufreq_hw 0>;
8686
operating-points-v2 = <&cpu0_opp_table>;
8787
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
88-
<&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>;
88+
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
8989
power-domains = <&CPU_PD1>;
9090
power-domain-names = "psci";
9191
#cooling-cells = <2>;
@@ -109,7 +109,7 @@
109109
qcom,freq-domain = <&cpufreq_hw 0>;
110110
operating-points-v2 = <&cpu0_opp_table>;
111111
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
112-
<&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>;
112+
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
113113
power-domains = <&CPU_PD2>;
114114
power-domain-names = "psci";
115115
#cooling-cells = <2>;
@@ -133,7 +133,7 @@
133133
qcom,freq-domain = <&cpufreq_hw 0>;
134134
operating-points-v2 = <&cpu0_opp_table>;
135135
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
136-
<&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>;
136+
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
137137
power-domains = <&CPU_PD3>;
138138
power-domain-names = "psci";
139139
#cooling-cells = <2>;
@@ -157,7 +157,7 @@
157157
qcom,freq-domain = <&cpufreq_hw 1>;
158158
operating-points-v2 = <&cpu4_opp_table>;
159159
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
160-
<&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>;
160+
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
161161
power-domains = <&CPU_PD4>;
162162
power-domain-names = "psci";
163163
#cooling-cells = <2>;
@@ -181,7 +181,7 @@
181181
qcom,freq-domain = <&cpufreq_hw 1>;
182182
operating-points-v2 = <&cpu4_opp_table>;
183183
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
184-
<&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>;
184+
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
185185
power-domains = <&CPU_PD5>;
186186
power-domain-names = "psci";
187187
#cooling-cells = <2>;
@@ -205,7 +205,7 @@
205205
qcom,freq-domain = <&cpufreq_hw 1>;
206206
operating-points-v2 = <&cpu4_opp_table>;
207207
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
208-
<&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>;
208+
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
209209
power-domains = <&CPU_PD6>;
210210
power-domain-names = "psci";
211211
#cooling-cells = <2>;
@@ -229,7 +229,7 @@
229229
qcom,freq-domain = <&cpufreq_hw 2>;
230230
operating-points-v2 = <&cpu7_opp_table>;
231231
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
232-
<&osm_l3 MASTER_OSM_L3_APPS 0 &osm_l3 SLAVE_OSM_L3 0>;
232+
<&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
233233
power-domains = <&CPU_PD7>;
234234
power-domain-names = "psci";
235235
#cooling-cells = <2>;
@@ -4342,7 +4342,7 @@
43424342
clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>;
43434343
clock-names = "xo", "alternate";
43444344

4345-
#interconnect-cells = <2>;
4345+
#interconnect-cells = <1>;
43464346
};
43474347

43484348
cpufreq_hw: cpufreq@18323000 {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
qcom,freq-domain = <&cpufreq_hw 0>;
108108
operating-points-v2 = <&cpu0_opp_table>;
109109
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
110-
<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;
110+
<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;
111111
#cooling-cells = <2>;
112112
L2_0: l2-cache {
113113
compatible = "cache";
@@ -138,7 +138,7 @@
138138
qcom,freq-domain = <&cpufreq_hw 0>;
139139
operating-points-v2 = <&cpu0_opp_table>;
140140
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
141-
<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;
141+
<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;
142142
#cooling-cells = <2>;
143143
L2_100: l2-cache {
144144
compatible = "cache";
@@ -163,7 +163,7 @@
163163
qcom,freq-domain = <&cpufreq_hw 0>;
164164
operating-points-v2 = <&cpu0_opp_table>;
165165
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
166-
<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;
166+
<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;
167167
#cooling-cells = <2>;
168168
L2_200: l2-cache {
169169
compatible = "cache";
@@ -188,7 +188,7 @@
188188
qcom,freq-domain = <&cpufreq_hw 0>;
189189
operating-points-v2 = <&cpu0_opp_table>;
190190
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
191-
<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;
191+
<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;
192192
#cooling-cells = <2>;
193193
L2_300: l2-cache {
194194
compatible = "cache";
@@ -213,7 +213,7 @@
213213
qcom,freq-domain = <&cpufreq_hw 1>;
214214
operating-points-v2 = <&cpu4_opp_table>;
215215
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
216-
<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;
216+
<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;
217217
#cooling-cells = <2>;
218218
L2_400: l2-cache {
219219
compatible = "cache";
@@ -238,7 +238,7 @@
238238
qcom,freq-domain = <&cpufreq_hw 1>;
239239
operating-points-v2 = <&cpu4_opp_table>;
240240
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
241-
<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;
241+
<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;
242242
#cooling-cells = <2>;
243243
L2_500: l2-cache {
244244
compatible = "cache";
@@ -263,7 +263,7 @@
263263
qcom,freq-domain = <&cpufreq_hw 1>;
264264
operating-points-v2 = <&cpu4_opp_table>;
265265
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
266-
<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;
266+
<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;
267267
#cooling-cells = <2>;
268268
L2_600: l2-cache {
269269
compatible = "cache";
@@ -288,7 +288,7 @@
288288
qcom,freq-domain = <&cpufreq_hw 2>;
289289
operating-points-v2 = <&cpu7_opp_table>;
290290
interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,
291-
<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;
291+
<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;
292292
#cooling-cells = <2>;
293293
L2_700: l2-cache {
294294
compatible = "cache";
@@ -5679,7 +5679,7 @@
56795679
clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>;
56805680
clock-names = "xo", "alternate";
56815681

5682-
#interconnect-cells = <2>;
5682+
#interconnect-cells = <1>;
56835683
};
56845684

56855685
cpufreq_hw: cpufreq@18591000 {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,6 +1744,8 @@
17441744
qcom,controlled-remotely;
17451745
iommus = <&apps_smmu 0x594 0x0011>,
17461746
<&apps_smmu 0x596 0x0011>;
1747+
/* FIXME: Probing BAM DMA causes some abort and system hang */
1748+
status = "fail";
17471749
};
17481750

17491751
crypto: crypto@1dfa000 {
@@ -1755,6 +1757,8 @@
17551757
<&apps_smmu 0x596 0x0011>;
17561758
interconnects = <&aggre2_noc MASTER_CRYPTO 0 &mc_virt SLAVE_EBI1 0>;
17571759
interconnect-names = "memory";
1760+
/* FIXME: dependency BAM DMA is disabled */
1761+
status = "disabled";
17581762
};
17591763

17601764
ipa: ipa@1e40000 {

0 commit comments

Comments
 (0)