Skip to content

Commit 1bc6a58

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.15.y' into v6.15+
2 parents b7cd716 + 3ef4962 commit 1bc6a58

37 files changed

Lines changed: 446 additions & 439 deletions

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 = 15
4-
SUBLEVEL = 0
4+
SUBLEVEL = 1
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@
222222
status = "disabled";
223223
};
224224

225-
gpio0: gpio@ffc03200 {
225+
gpio0: gpio@10c03200 {
226226
compatible = "snps,dw-apb-gpio";
227-
reg = <0xffc03200 0x100>;
227+
reg = <0x10c03200 0x100>;
228228
#address-cells = <1>;
229229
#size-cells = <0>;
230230
resets = <&rst GPIO0_RESET>;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,8 @@
378378
interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
379379
#dma-cells = <1>;
380380
qcom,ee = <1>;
381+
qcom,num-ees = <4>;
382+
num-channels = <16>;
381383
qcom,controlled-remotely;
382384
};
383385

0 commit comments

Comments
 (0)