Skip to content

Commit 35667a2

Browse files
torvaldstorvalds
committed
Merge tag 'arm-fixes-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "There is a fairly large number of bug fixes for Qualcomm platforms, most of them addressing issues with the devicetree files for the newly added Snapdragon X1 based laptops to make them more reliable. The Qualcomm driver changes address a few build-time issues as well as runtime problems in the tzmem and scm firmware, the USB Type-C driver, and the cmd-db and pmic_glink soc drivers. The NXP i.MX usually gets a bunch of devicetree fixes that is proportional to the number of supported machines. This includes both warning fixes and correctness for the 64-bit i.MX9, i.MX8 and layerscape platforms, as well as a single fix for a 32-bit i.MX6 based board. The other changes are the usual minor changes, including an update to the MAINTAINERS file, an omap3 dts file and a SoC driver for mpfs (risc-v)" * tag 'arm-fixes-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (50 commits) firmware: microchip: fix incorrect error report of programming:timeout on success soc: qcom: pd-mapper: Fix singleton refcount firmware: qcom: tzmem: disable sdm670 platform soc: qcom: pmic_glink: Actually communicate when remote goes down usb: typec: ucsi: Move unregister out of atomic section soc: qcom: pmic_glink: Fix race during initialization firmware: qcom: qseecom: remove unused functions firmware: qcom: tzmem: fix virtual-to-physical address conversion firmware: qcom: scm: Mark get_wq_ctx() as atomic call arm64: dts: qcom: x1e80100: Fix Adreno SMMU global interrupt arm64: dts: qcom: disable GPU on x1e80100 by default arm64: dts: imx8mm-phygate: fix typo pinctrcl-0 arm64: dts: imx95: correct L3Cache cache-sets arm64: dts: imx95: correct a55 power-domains arm64: dts: freescale: imx93-tqma9352-mba93xxla: fix typo arm64: dts: freescale: imx93-tqma9352: fix CMA alloc-ranges ARM: dts: imx6dl-yapp43: Increase LED current to match the yapp4 HW design arm64: dts: imx93: update default value for snps,clk-csr arm64: dts: freescale: tqma9352: Fix watchdog reset arm64: dts: imx8mp-beacon-kit: Fix Stereo Audio on WM8962 ...
2 parents 1934261 + 9cc7b17 commit 35667a2

36 files changed

+366
-176
lines changed

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,8 @@ Kenneth Westfield <[email protected]> <[email protected]>
354354
Kiran Gunda <[email protected]> <[email protected]>
355355
Kirill Tkhai <[email protected]> <[email protected]>
356356
Kishon Vijay Abraham I <[email protected]> <[email protected]>
357+
Konrad Dybcio <[email protected]> <[email protected]>
358+
Konrad Dybcio <[email protected]> <[email protected]>
357359
Konstantin Khlebnikov <[email protected]> <[email protected]>
358360
Konstantin Khlebnikov <[email protected]> <[email protected]>
359361
Koushik <[email protected]>

‎MAINTAINERS

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2539,8 +2539,7 @@ L: [email protected] (moderated for non-subscribers)
25392539
S: Supported
25402540
W: http://www.linux4sam.org
25412541
T: git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
2542-
F: arch/arm/boot/dts/microchip/at91*
2543-
F: arch/arm/boot/dts/microchip/sama*
2542+
F: arch/arm/boot/dts/microchip/
25442543
F: arch/arm/include/debug/at91.S
25452544
F: arch/arm/mach-at91/
25462545
F: drivers/memory/atmel*
@@ -2749,7 +2748,7 @@ F: include/linux/soc/qcom/
27492748

27502749
ARM/QUALCOMM SUPPORT
27512750
M: Bjorn Andersson <[email protected]>
2752-
M: Konrad Dybcio <konrad.dybcio@linaro.org>
2751+
M: Konrad Dybcio <konradybcio@kernel.org>
27532752
L: [email protected]
27542753
S: Maintained
27552754
T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@ -7112,7 +7111,7 @@ F: drivers/gpu/drm/tiny/panel-mipi-dbi.c
71127111
DRM DRIVER for Qualcomm Adreno GPUs
71137112
M: Rob Clark <[email protected]>
71147113
R: Sean Paul <[email protected]>
7115-
R: Konrad Dybcio <konrad.dybcio@linaro.org>
7114+
R: Konrad Dybcio <konradybcio@kernel.org>
71167115
L: [email protected]
71177116
L: [email protected]
71187117
L: [email protected]
@@ -18800,7 +18799,7 @@ F: include/uapi/drm/qaic_accel.h
1880018799

1880118800
QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
1880218801
M: Bjorn Andersson <[email protected]>
18803-
M: Konrad Dybcio <konrad.dybcio@linaro.org>
18802+
M: Konrad Dybcio <konradybcio@kernel.org>
1880418803
L: [email protected]
1880518804
L: [email protected]
1880618805
S: Maintained

‎arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,24 +274,24 @@
274274

275275
led@0 {
276276
chan-name = "R";
277-
led-cur = /bits/ 8 <0x20>;
278-
max-cur = /bits/ 8 <0x60>;
277+
led-cur = /bits/ 8 <0x6e>;
278+
max-cur = /bits/ 8 <0xc8>;
279279
reg = <0>;
280280
color = <LED_COLOR_ID_RED>;
281281
};
282282

283283
led@1 {
284284
chan-name = "G";
285-
led-cur = /bits/ 8 <0x20>;
286-
max-cur = /bits/ 8 <0x60>;
285+
led-cur = /bits/ 8 <0xbe>;
286+
max-cur = /bits/ 8 <0xc8>;
287287
reg = <1>;
288288
color = <LED_COLOR_ID_GREEN>;
289289
};
290290

291291
led@2 {
292292
chan-name = "B";
293-
led-cur = /bits/ 8 <0x20>;
294-
max-cur = /bits/ 8 <0x60>;
293+
led-cur = /bits/ 8 <0xbe>;
294+
max-cur = /bits/ 8 <0xc8>;
295295
reg = <2>;
296296
color = <LED_COLOR_ID_BLUE>;
297297
};

‎arch/arm/boot/dts/ti/omap/omap3-n900.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@
781781

782782
mount-matrix = "-1", "0", "0",
783783
"0", "1", "0",
784-
"0", "0", "1";
784+
"0", "0", "-1";
785785
};
786786

787787
cam1: camera@3e {

‎arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
};
176176
};
177177

178-
core-cluster-thermal {
178+
cluster-thermal {
179179
polling-delay-passive = <1000>;
180180
polling-delay = <5000>;
181181
thermal-sensors = <&tmu 1>;

‎arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
};
215215
};
216216

217-
core-cluster-thermal {
217+
cluster-thermal {
218218
polling-delay-passive = <1000>;
219219
polling-delay = <5000>;
220220
thermal-sensors = <&tmu 3>;

‎arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
};
183183
};
184184

185-
core-cluster-thermal {
185+
cluster-thermal {
186186
polling-delay-passive = <1000>;
187187
polling-delay = <5000>;
188188
thermal-sensors = <&tmu 3>;

‎arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
};
132132

133133
thermal-zones {
134-
core-cluster-thermal {
134+
cluster-thermal {
135135
polling-delay-passive = <1000>;
136136
polling-delay = <5000>;
137137
thermal-sensors = <&tmu 0>;

‎arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
};
123123
};
124124

125-
core-cluster1-thermal {
125+
cluster1-thermal {
126126
polling-delay-passive = <1000>;
127127
polling-delay = <5000>;
128128
thermal-sensors = <&tmu 4>;
@@ -151,7 +151,7 @@
151151
};
152152
};
153153

154-
core-cluster2-thermal {
154+
cluster2-thermal {
155155
polling-delay-passive = <1000>;
156156
polling-delay = <5000>;
157157
thermal-sensors = <&tmu 5>;
@@ -180,7 +180,7 @@
180180
};
181181
};
182182

183-
core-cluster3-thermal {
183+
cluster3-thermal {
184184
polling-delay-passive = <1000>;
185185
polling-delay = <5000>;
186186
thermal-sensors = <&tmu 6>;
@@ -209,7 +209,7 @@
209209
};
210210
};
211211

212-
core-cluster4-thermal {
212+
cluster4-thermal {
213213
polling-delay-passive = <1000>;
214214
polling-delay = <5000>;
215215
thermal-sensors = <&tmu 7>;

‎arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@
492492
};
493493
};
494494

495-
ddr-cluster5-thermal {
495+
ddr-ctrl5-thermal {
496496
polling-delay-passive = <1000>;
497497
polling-delay = <5000>;
498498
thermal-sensors = <&tmu 1>;

0 commit comments

Comments
 (0)