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

ARM: dts: sun8i: v3s: Move the csi1 block to follow address order

The csi1 block node was mistakenly added before the gic node, although
its address comes after the gic's. Move the node to its correct
position.

Fixes: 90e048101fa1 ("ARM: dts: sun8i: V3/V3s/S3/S3L: add CSI1 device node")
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220205185429.2278860-2-paul.kocialkowski@bootlin.com

authored by

Paul Kocialkowski and committed by
Maxime Ripard
c4af5169 e4bae63f

+11 -11
+11 -11
arch/arm/boot/dts/sun8i-v3s.dtsi
··· 593 593 #size-cells = <0>; 594 594 }; 595 595 596 + gic: interrupt-controller@1c81000 { 597 + compatible = "arm,gic-400"; 598 + reg = <0x01c81000 0x1000>, 599 + <0x01c82000 0x2000>, 600 + <0x01c84000 0x2000>, 601 + <0x01c86000 0x2000>; 602 + interrupt-controller; 603 + #interrupt-cells = <3>; 604 + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; 605 + }; 606 + 596 607 csi1: camera@1cb4000 { 597 608 compatible = "allwinner,sun8i-v3s-csi"; 598 609 reg = <0x01cb4000 0x3000>; ··· 614 603 clock-names = "bus", "mod", "ram"; 615 604 resets = <&ccu RST_BUS_CSI>; 616 605 status = "disabled"; 617 - }; 618 - 619 - gic: interrupt-controller@1c81000 { 620 - compatible = "arm,gic-400"; 621 - reg = <0x01c81000 0x1000>, 622 - <0x01c82000 0x2000>, 623 - <0x01c84000 0x2000>, 624 - <0x01c86000 0x2000>; 625 - interrupt-controller; 626 - #interrupt-cells = <3>; 627 - interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; 628 606 }; 629 607 }; 630 608 };