ARM: dts: BCM63xx: re-parent NAND controller node (9d7ef1b7) · Commits · 戴 / test

The NAND controller is a child node of the UBUS (legacy) bus, not the AXI (new) bus, re-parent the NAND controller node accordingly. This was a mistake introduced by a failed merge of this NAND node with other changes (PMB). Fixes: ("ARM: bcm63138: add NAND DT support") Reported-by:

Brian Norris <computersforpeace@gmail.com> Signed-off-by:

Florian Fainelli <f.fainelli@gmail.com>

arch/arm/boot/dts/bcm63138.dtsi

+11 −11

Original line number	Diff line number	Diff line
		@@ -120,17 +120,6 @@
		reg = <0x4800e0 0x10>;
		#reset-cells = <2>;
		};

		nand: nand@2000 {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
		reg = <0x2000 0x600>, <0xf0 0x10>;
		reg-names = "nand", "nand-int-base";
		status = "disabled";
		interrupts = <GIC_SPI 38 0>;
		interrupt-names = "nand";
		};
		};

		/* Legacy UBUS base */
		@@ -163,6 +152,17 @@
		status = "disabled";
		};

		nand: nand@2000 {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
		reg = <0x2000 0x600>, <0xf0 0x10>;
		reg-names = "nand", "nand-int-base";
		status = "disabled";
		interrupts = <GIC_SPI 38 0>;
		interrupt-names = "nand";
		};

		bootlut: bootlut@8000 {
		compatible = "brcm,bcm63138-bootlut";
		reg = <0x8000 0x50>;

Admin message