Skip to content

Commit 92e55a8

Browse files
Merge tag 'dt-fixes-for-palmer-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git into fixes
Microchip RISC-V devicetree fixes for 6.0-rc3 Two sets of fixes this time around: - A fix for the interrupt ordering of the l2-cache controller. If the driver is enabled, it would spam the console /constantly/, rendering the system useless. - General cleanup for some bogus properties in the dt, part of my quest for zero dtbs_check warnings. On that note, the interrupt ordering adds a dtbs_check warning - but I considered that fixing the potentially useless system was more of a priority. Signed-off-by: Conor Dooley <[email protected]> * tag 'dt-fixes-for-palmer-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git: riscv: dts: microchip: mpfs: remove pci axi address translation property riscv: dts: microchip: mpfs: remove bogus card-detect-delay riscv: dts: microchip: mpfs: remove ti,fifo-depth property riscv: dts: microchip: mpfs: fix incorrect pcie child node name riscv: dts: microchip: correct L2 cache interrupts
2 parents 9626423 + e4009c5 commit 92e55a8

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,10 @@
8484

8585
phy1: ethernet-phy@9 {
8686
reg = <9>;
87-
ti,fifo-depth = <0x1>;
8887
};
8988

9089
phy0: ethernet-phy@8 {
9190
reg = <8>;
92-
ti,fifo-depth = <0x1>;
9391
};
9492
};
9593

@@ -102,7 +100,6 @@
102100
disable-wp;
103101
cap-sd-highspeed;
104102
cap-mmc-highspeed;
105-
card-detect-delay = <200>;
106103
mmc-ddr-1_8v;
107104
mmc-hs200-1_8v;
108105
sd-uhs-sdr12;

arch/riscv/boot/dts/microchip/mpfs-polarberry.dts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,10 @@
5454

5555
phy1: ethernet-phy@5 {
5656
reg = <5>;
57-
ti,fifo-depth = <0x01>;
5857
};
5958

6059
phy0: ethernet-phy@4 {
6160
reg = <4>;
62-
ti,fifo-depth = <0x01>;
6361
};
6462
};
6563

@@ -72,7 +70,6 @@
7270
disable-wp;
7371
cap-sd-highspeed;
7472
cap-mmc-highspeed;
75-
card-detect-delay = <200>;
7673
mmc-ddr-1_8v;
7774
mmc-hs200-1_8v;
7875
sd-uhs-sdr12;

arch/riscv/boot/dts/microchip/mpfs.dtsi

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
cache-size = <2097152>;
194194
cache-unified;
195195
interrupt-parent = <&plic>;
196-
interrupts = <1>, <2>, <3>;
196+
interrupts = <1>, <3>, <4>, <2>;
197197
};
198198

199199
clint: clint@2000000 {
@@ -485,9 +485,8 @@
485485
ranges = <0x3000000 0x0 0x8000000 0x20 0x8000000 0x0 0x80000000>;
486486
msi-parent = <&pcie>;
487487
msi-controller;
488-
microchip,axi-m-atr0 = <0x10 0x0>;
489488
status = "disabled";
490-
pcie_intc: legacy-interrupt-controller {
489+
pcie_intc: interrupt-controller {
491490
#address-cells = <0>;
492491
#interrupt-cells = <1>;
493492
interrupt-controller;

0 commit comments

Comments
 (0)