Unverified Commit 7e11bc07 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'dt64-cleanup-6.4' of... 

Merge tag 'dt64-cleanup-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt

Minor improvements in ARM64 DTS for v6.4

1. Toshiba: white-space fixes.
2. Cavium, Marvell: fix GICv3 ITS node name.

* tag 'dt64-cleanup-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  arm64: dts: cavium: Fix GICv3 ITS nodes
  arm64: dts: marvell: armada-ap810: Fix GICv3 ITS node name
  arm64: dts: toshiba: adjust whitespace around '='

Link: https://lore.kernel.org/r/20230319152740.34551-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2b488183 d2e5c16f

arch/arm64/boot/dts/cavium/thunder-88xx.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -389,9 +389,10 @@ gic0: interrupt-controller@8010,00000000 { 
			      <0x8010 0x80000000 0x0 0x600000>; /* GICR */

			interrupts = <1 9 0xf04>;



			its: gic-its@8010,00020000 {

			its: msi-controller@801000020000 {

				compatible = "arm,gic-v3-its";

				msi-controller;

				#msi-cells = <1>;

				reg = <0x8010 0x20000 0x0 0x200000>;

			};

		};

arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ psci { 
		method = "smc";

	};



	gic: interrupt-controller@400080000 {

	gic: interrupt-controller@4000080000 {

		compatible = "arm,gic-v3";

		#interrupt-cells = <3>;

		#address-cells = <2>;
@@ -67,7 +67,7 @@ gic: interrupt-controller@400080000 { 
		      <0x04 0x01000000 0x0 0x1000000>;	/* GICR */

		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;



		gicits: gic-its@40010000 {

		gicits: msi-controller@4000100000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			reg = <0x04 0x00100000 0x0 0x20000>;	/* GIC ITS */

arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ gic: interrupt-controller@3000000 { 
				      <0x00d0000 0x1000>,	/* GICH */

				      <0x00e0000 0x2000>;	/* GICV */



				gic_its_ap0: interrupt-controller@3040000 {

				gic_its_ap0: msi-controller@3040000 {

					compatible = "arm,gic-v3-its";

					msi-controller;

					#msi-cells = <1>;

arch/arm64/boot/dts/toshiba/tmpv7708.dtsi

+1 −1

File changed.

Contains only whitespace changes.