Skip to content

Commit 676b222

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into rpi-6.12.y
2 parents 63252ab + ba9210b commit 676b222

Some content is hidden

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

57 files changed

+406
-353
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 12
4-
SUBLEVEL = 31
4+
SUBLEVEL = 32
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

arch/arm64/boot/dts/qcom/ipq9574.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@
261261
interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
262262
#dma-cells = <1>;
263263
qcom,ee = <1>;
264+
qcom,num-ees = <4>;
265+
num-channels = <16>;
264266
qcom,controlled-remotely;
265267
};
266268

0 commit comments

Comments
 (0)