Skip to content

Commit 9afba13

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-6.6.y' into rpi-6.6.y
2 parents 081eebd + 4407146 commit 9afba13

File tree

257 files changed

+2392
-1205
lines changed

Some content is hidden

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

257 files changed

+2392
-1205
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 77
4+
SUBLEVEL = 78
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

‎arch/arm/boot/dts/ti/omap/dra7-l4.dtsi

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
ranges = <0x00000000 0x4a000000 0x100000>, /* segment 0 */
1313
<0x00100000 0x4a100000 0x100000>, /* segment 1 */
1414
<0x00200000 0x4a200000 0x100000>; /* segment 2 */
15+
dma-ranges;
1516

1617
segment@0 { /* 0x4a000000 */
1718
compatible = "simple-pm-bus";
@@ -557,6 +558,7 @@
557558
<0x0007e000 0x0017e000 0x001000>, /* ap 124 */
558559
<0x00059000 0x00159000 0x001000>, /* ap 125 */
559560
<0x0005a000 0x0015a000 0x001000>; /* ap 126 */
561+
dma-ranges;
560562

561563
target-module@2000 { /* 0x4a102000, ap 27 3c.0 */
562564
compatible = "ti,sysc";

‎arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi

+10
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@
446446
pinctrl-names = "default";
447447
pinctrl-0 = <
448448
&hsusb2_2_pins
449+
&mcspi3hog_pins
449450
>;
450451

451452
hsusb2_2_pins: hsusb2-2-pins {
@@ -459,6 +460,15 @@
459460
>;
460461
};
461462

463+
mcspi3hog_pins: mcspi3hog-pins {
464+
pinctrl-single,pins = <
465+
OMAP3630_CORE2_IOPAD(0x25dc, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* etk_d0 */
466+
OMAP3630_CORE2_IOPAD(0x25de, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* etk_d1 */
467+
OMAP3630_CORE2_IOPAD(0x25e0, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* etk_d2 */
468+
OMAP3630_CORE2_IOPAD(0x25e2, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* etk_d3 */
469+
>;
470+
};
471+
462472
spi_gpio_pins: spi-gpio-pinmux-pins {
463473
pinctrl-single,pins = <
464474
OMAP3630_CORE2_IOPAD(0x25d8, PIN_OUTPUT | MUX_MODE4) /* clk */

‎arch/arm64/boot/dts/nvidia/tegra234.dtsi

+4-2
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,7 @@
17091709
compatible = "nvidia,tegra234-sce-fabric";
17101710
reg = <0x0 0xb600000 0x0 0x40000>;
17111711
interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
1712-
status = "okay";
1712+
status = "disabled";
17131713
};
17141714

17151715
rce-fabric@be00000 {
@@ -1889,7 +1889,7 @@
18891889
};
18901890

18911891
dce-fabric@de00000 {
1892-
compatible = "nvidia,tegra234-sce-fabric";
1892+
compatible = "nvidia,tegra234-dce-fabric";
18931893
reg = <0x0 0xde00000 0x0 0x40000>;
18941894
interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>;
18951895
status = "okay";
@@ -1912,6 +1912,8 @@
19121912
#redistributor-regions = <1>;
19131913
#interrupt-cells = <3>;
19141914
interrupt-controller;
1915+
1916+
#address-cells = <0>;
19151917
};
19161918

19171919
smmu_iso: iommu@10000000 {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,7 @@
16671667

16681668
remoteproc_mpss: remoteproc@6080000 {
16691669
compatible = "qcom,sm6115-mpss-pas";
1670-
reg = <0x0 0x06080000 0x0 0x100>;
1670+
reg = <0x0 0x06080000 0x0 0x10000>;
16711671

16721672
interrupts-extended = <&intc GIC_SPI 307 IRQ_TYPE_EDGE_RISING>,
16731673
<&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -2310,9 +2310,9 @@
23102310
};
23112311
};
23122312

2313-
remoteproc_adsp: remoteproc@ab00000 {
2313+
remoteproc_adsp: remoteproc@a400000 {
23142314
compatible = "qcom,sm6115-adsp-pas";
2315-
reg = <0x0 0x0ab00000 0x0 0x100>;
2315+
reg = <0x0 0x0a400000 0x0 0x4040>;
23162316

23172317
interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_EDGE_RISING>,
23182318
<&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -2384,7 +2384,7 @@
23842384

23852385
remoteproc_cdsp: remoteproc@b300000 {
23862386
compatible = "qcom,sm6115-cdsp-pas";
2387-
reg = <0x0 0x0b300000 0x0 0x100000>;
2387+
reg = <0x0 0x0b300000 0x0 0x4040>;
23882388

23892389
interrupts-extended = <&intc GIC_SPI 265 IRQ_TYPE_EDGE_RISING>,
23902390
<&cdsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@
935935
power-domains = <&rpmhpd SM6350_CX>;
936936
operating-points-v2 = <&qup_opp_table>;
937937
interconnects = <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_CORE_0 0>,
938-
<&aggre1_noc MASTER_QUP_0 0 &clk_virt SLAVE_EBI_CH0 0>;
938+
<&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>;
939939
interconnect-names = "qup-core", "qup-config";
940940
status = "disabled";
941941
};
@@ -1259,7 +1259,7 @@
12591259

12601260
adsp: remoteproc@3000000 {
12611261
compatible = "qcom,sm6350-adsp-pas";
1262-
reg = <0 0x03000000 0 0x100>;
1262+
reg = <0x0 0x03000000 0x0 0x10000>;
12631263

12641264
interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
12651265
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -1480,7 +1480,7 @@
14801480

14811481
mpss: remoteproc@4080000 {
14821482
compatible = "qcom,sm6350-mpss-pas";
1483-
reg = <0x0 0x04080000 0x0 0x4040>;
1483+
reg = <0x0 0x04080000 0x0 0x10000>;
14841484

14851485
interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_EDGE_RISING>,
14861486
<&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1471,9 +1471,9 @@
14711471
#power-domain-cells = <1>;
14721472
};
14731473

1474-
remoteproc_mss: remoteproc@6000000 {
1474+
remoteproc_mss: remoteproc@6080000 {
14751475
compatible = "qcom,sm6375-mpss-pas";
1476-
reg = <0 0x06000000 0 0x4040>;
1476+
reg = <0x0 0x06080000 0x0 0x10000>;
14771477

14781478
interrupts-extended = <&intc GIC_SPI 307 IRQ_TYPE_EDGE_RISING>,
14791479
<&smp2p_modem_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -1514,7 +1514,7 @@
15141514

15151515
remoteproc_adsp: remoteproc@a400000 {
15161516
compatible = "qcom,sm6375-adsp-pas";
1517-
reg = <0 0x0a400000 0 0x100>;
1517+
reg = <0 0x0a400000 0 0x10000>;
15181518

15191519
interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
15201520
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -1550,9 +1550,9 @@
15501550
};
15511551
};
15521552

1553-
remoteproc_cdsp: remoteproc@b000000 {
1553+
remoteproc_cdsp: remoteproc@b300000 {
15541554
compatible = "qcom,sm6375-cdsp-pas";
1555-
reg = <0x0 0x0b000000 0x0 0x100000>;
1555+
reg = <0x0 0x0b300000 0x0 0x10000>;
15561556

15571557
interrupts-extended = <&intc GIC_SPI 265 IRQ_TYPE_EDGE_RISING>,
15581558
<&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,

0 commit comments

Comments
 (0)