Unverified Commit 92c7c5b0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'juno-fixes-6.0' of... 

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/20220829174420.207880-1-sudeep.holla@arm.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 251e5d71 422ab8fe

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

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
		compatible = "arm,mhu", "arm,primecell";

		reg = <0x0 0x2b1f0000 0x0 0x1000>;

		interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

			     <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

		#mbox-cells = <1>;

		clocks = <&soc_refclk100mhz>;

		clock-names = "apb_pclk";

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

+0 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
			port@0 {

				reg = <0>;

				csys2_funnel_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&etf0_out_port>;

				};

			};
@@ -75,7 +74,6 @@ 
			port@1 {

				reg = <1>;

				csys2_funnel_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&etf1_out_port>;

				};

			};