tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 7e11bc07 2b488183

+6 -5
+2 -1
arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
··· 389 389 <0x8010 0x80000000 0x0 0x600000>; /* GICR */ 390 390 interrupts = <1 9 0xf04>; 391 391 392 - its: gic-its@8010,00020000 { 392 + its: msi-controller@801000020000 { 393 393 compatible = "arm,gic-v3-its"; 394 394 msi-controller; 395 + #msi-cells = <1>; 395 396 reg = <0x8010 0x20000 0x0 0x200000>; 396 397 }; 397 398 };
+2 -2
arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi
··· 55 55 method = "smc"; 56 56 }; 57 57 58 - gic: interrupt-controller@400080000 { 58 + gic: interrupt-controller@4000080000 { 59 59 compatible = "arm,gic-v3"; 60 60 #interrupt-cells = <3>; 61 61 #address-cells = <2>; ··· 67 67 <0x04 0x01000000 0x0 0x1000000>; /* GICR */ 68 68 interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; 69 69 70 - gicits: gic-its@40010000 { 70 + gicits: msi-controller@4000100000 { 71 71 compatible = "arm,gic-v3-its"; 72 72 msi-controller; 73 73 reg = <0x04 0x00100000 0x0 0x20000>; /* GIC ITS */
+1 -1
arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
··· 54 54 <0x00d0000 0x1000>, /* GICH */ 55 55 <0x00e0000 0x2000>; /* GICV */ 56 56 57 - gic_its_ap0: interrupt-controller@3040000 { 57 + gic_its_ap0: msi-controller@3040000 { 58 58 compatible = "arm,gic-v3-its"; 59 59 msi-controller; 60 60 #msi-cells = <1>;
+1 -1
arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
··· 485 485 <0x0 0x28050000 0x0 0x00010000>, 486 486 <0x0 0x24200000 0x0 0x00002000>, 487 487 <0x0 0x24162000 0x0 0x00001000>; 488 - reg-names = "dbi", "config", "ulreg", "smu", "mpu"; 488 + reg-names = "dbi", "config", "ulreg", "smu", "mpu"; 489 489 device_type = "pci"; 490 490 bus-range = <0x00 0xff>; 491 491 num-lanes = <2>;