Unverified Commit 6a65fc36 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'juno-updates-5.20' of... 

Merge tag 'juno-updates-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/dt

Armv8 Juno/FVP updates for v5.20

Just a small bunch of miscellaneous updates: addition of missing
cache-level property to L2 caches on Juno, whitespace adjustments
and removal of erroneous 'mbox-name' and 'panel-dpi' compatible in
the device tree nodes.

* tag 'juno-updates-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: Add cache-level property to L2 caches
  arm64: dts: arm: adjust whitespace around '='
  arm64: dts: arm/juno: Drop erroneous 'mbox-name' property
  arm64: dts: arm/fvp-base-revc: Remove 'panel-dpi' compatible

Link: https://lore.kernel.org/r/20220706115026.2272643-1-sudeep.holla@arm.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 888c173e 156c9041

arch/arm64/boot/dts/arm/fvp-base-revc.dts

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ smmu: iommu@2b400000 { 
	};



	panel {

		compatible = "arm,rtsm-display", "panel-dpi";

		compatible = "arm,rtsm-display";

		port {

			panel_in: endpoint {

				remote-endpoint = <&clcd_pads>;

arch/arm64/boot/dts/arm/juno-r1.dts

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ A57_L2: l2-cache0 { 
			cache-size = <0x200000>;

			cache-line-size = <64>;

			cache-sets = <2048>;

			cache-level = <2>;

		};



		A53_L2: l2-cache1 {
@@ -199,6 +200,7 @@ A53_L2: l2-cache1 { 
			cache-size = <0x100000>;

			cache-line-size = <64>;

			cache-sets = <1024>;

			cache-level = <2>;

		};

	};

arch/arm64/boot/dts/arm/juno-r2.dts

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ A72_L2: l2-cache0 { 
			cache-size = <0x200000>;

			cache-line-size = <64>;

			cache-sets = <2048>;

			cache-level = <2>;

		};



		A53_L2: l2-cache1 {
@@ -205,6 +206,7 @@ A53_L2: l2-cache1 { 
			cache-size = <0x100000>;

			cache-line-size = <64>;

			cache-sets = <1024>;

			cache-level = <2>;

		};

	};

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

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ &gpu { 
&mailbox {

	compatible = "arm,mhu-doorbell", "arm,primecell";

	#mbox-cells = <2>;

	mbox-name = "ARM-MHU";

};



&smmu_etr {

arch/arm64/boot/dts/arm/juno.dts

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ A57_L2: l2-cache0 { 
			cache-size = <0x200000>;

			cache-line-size = <64>;

			cache-sets = <2048>;

			cache-level = <2>;

		};



		A53_L2: l2-cache1 {
@@ -204,6 +205,7 @@ A53_L2: l2-cache1 { 
			cache-size = <0x100000>;

			cache-line-size = <64>;

			cache-sets = <1024>;

			cache-level = <2>;

		};

	};

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

+22 −22

File changed.

Contains only whitespace changes.

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

+8 −8

File changed.

Contains only whitespace changes.