diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:41:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:41:46 +0200 |
| commit | 63cb275e6e7a023f4e25d227a875f06563c9d7e9 (patch) | |
| tree | 74cebcd016e79b5ca4fab168655b3136533a3659 | |
| parent | e59bff9af4f8e6093909df605f31400eb8bf6c20 (diff) | |
| parent | 9d7ef1b76c131f9b5e0a31fd1444d4fa6b8a841c (diff) | |
| download | linux-63cb275e6e7a023f4e25d227a875f06563c9d7e9.tar.bz2 | |
Merge tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux into next/dt
Merge "This pull request contains a single change" from Florian Fainelli:
- fix the NAND controller node on bcm63138, the original change was a mis-merge that
did not properly parent it to the "ubus" node
* tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux:
ARM: dts: BCM63xx: re-parent NAND controller node
| -rw-r--r-- | arch/arm/boot/dts/bcm63138.dtsi | 22 |
1 files 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 = <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>; |