From 9d7ef1b76c131f9b5e0a31fd1444d4fa6b8a841c Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 26 May 2015 20:27:30 -0700 Subject: [PATCH] ARM: dts: BCM63xx: re-parent NAND controller node 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: b5762cacc411 ("ARM: bcm63138: add NAND DT support") Reported-by: Brian Norris Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm63138.dtsi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index 0ad836f310f1..34cd64051250 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -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 = ; - 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 = ; + interrupt-names = "nand"; + }; + bootlut: bootlut@8000 { compatible = "brcm,bcm63138-bootlut"; reg = <0x8000 0x50>; -- 2.20.1