Skip to content

Commit 92c7c5b

Browse files
committed
Merge tag 'juno-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes
Armv8 Juno fixes for v6.0 Couple of fixes to add missing MHU secure-irq and remove the legacy coresight 'slave-mode' property. * tag 'juno-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: juno: Add missing MHU secure-irq arm64: dts: arm: juno: Remove legacy Coresight 'slave-mode' property Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 251e5d7 + 422ab8f commit 92c7c5b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

arch/arm64/boot/dts/arm/juno-base.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
compatible = "arm,mhu", "arm,primecell";
2727
reg = <0x0 0x2b1f0000 0x0 0x1000>;
2828
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
29-
<GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
29+
<GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
30+
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
3031
#mbox-cells = <1>;
3132
clocks = <&soc_refclk100mhz>;
3233
clock-names = "apb_pclk";

arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,13 @@
6767
port@0 {
6868
reg = <0>;
6969
csys2_funnel_in_port0: endpoint {
70-
slave-mode;
7170
remote-endpoint = <&etf0_out_port>;
7271
};
7372
};
7473

7574
port@1 {
7675
reg = <1>;
7776
csys2_funnel_in_port1: endpoint {
78-
slave-mode;
7977
remote-endpoint = <&etf1_out_port>;
8078
};
8179
};

0 commit comments

Comments
 (0)