Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[pandora-kernel.git] / arch / powerpc / boot / dts / tqm8560.dts

diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index a4ee596..3fe3520 100644 (file)
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -2,6 +2,7 @@
  * TQM 8560 Device Tree Source
  *
  * Copyright 2008 Freescale Semiconductor Inc.
+ * Copyright 2008 Wolfgang Grandegger <wg@grandegger.com>
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -12,8 +13,8 @@
 /dts-v1/;
 
 / {
-       model = "tqm,8560";
-       compatible = "tqm,8560", "tqm,85xx";
+       model = "tqc,tqm8560";
+       compatible = "tqc,tqm8560";
        #address-cells = <1>;
        #size-cells = <1>;
 
@@ -90,6 +91,47 @@
                        };
                };
 
+               dma@21300 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "fsl,mpc8560-dma", "fsl,eloplus-dma";
+                       reg = <0x21300 0x4>;
+                       ranges = <0x0 0x21100 0x200>;
+                       cell-index = <0>;
+                       dma-channel@0 {
+                               compatible = "fsl,mpc8560-dma-channel",
+                                               "fsl,eloplus-dma-channel";
+                               reg = <0x0 0x80>;
+                               cell-index = <0>;
+                               interrupt-parent = <&mpic>;
+                               interrupts = <20 2>;
+                       };
+                       dma-channel@80 {
+                               compatible = "fsl,mpc8560-dma-channel",
+                                               "fsl,eloplus-dma-channel";
+                               reg = <0x80 0x80>;
+                               cell-index = <1>;
+                               interrupt-parent = <&mpic>;
+                               interrupts = <21 2>;
+                       };
+                       dma-channel@100 {
+                               compatible = "fsl,mpc8560-dma-channel",
+                                               "fsl,eloplus-dma-channel";
+                               reg = <0x100 0x80>;
+                               cell-index = <2>;
+                               interrupt-parent = <&mpic>;
+                               interrupts = <22 2>;
+                       };
+                       dma-channel@180 {
+                               compatible = "fsl,mpc8560-dma-channel",
+                                               "fsl,eloplus-dma-channel";
+                               reg = <0x180 0x80>;
+                               cell-index = <3>;
+                               interrupt-parent = <&mpic>;
+                               interrupts = <23 2>;
+                       };
+               };
+
                mdio@24520 {
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -223,6 +265,70 @@
                };
        };
 
+       localbus@e0005000 {
+               compatible = "fsl,mpc8560-localbus", "fsl,pq3-localbus",
+                            "simple-bus";
+               #address-cells = <2>;
+               #size-cells = <1>;
+               reg = <0xe0005000 0x100>;       // BRx, ORx, etc.
+
+               ranges = <
+                       0 0x0 0xfc000000 0x04000000     // NOR FLASH bank 1
+                       1 0x0 0xf8000000 0x08000000     // NOR FLASH bank 0
+                       2 0x0 0xe3000000 0x00008000     // CAN (2 x i82527)
+               >;
+
+               flash@1,0 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "cfi-flash";
+                       reg = <1 0x0 0x8000000>;
+                       bank-width = <4>;
+                       device-width = <1>;
+
+                       partition@0 {
+                               label = "kernel";
+                               reg = <0x00000000 0x00200000>;
+                       };
+                       partition@200000 {
+                               label = "root";
+                               reg = <0x00200000 0x00300000>;
+                       };
+                       partition@500000 {
+                               label = "user";
+                               reg = <0x00500000 0x07a00000>;
+                       };
+                       partition@7f00000 {
+                               label = "env1";
+                               reg = <0x07f00000 0x00040000>;
+                       };
+                       partition@7f40000 {
+                               label = "env2";
+                               reg = <0x07f40000 0x00040000>;
+                       };
+                       partition@7f80000 {
+                               label = "u-boot";
+                               reg = <0x07f80000 0x00080000>;
+                               read-only;
+                       };
+               };
+
+               /* Note: CAN support needs be enabled in U-Boot */
+               can0@2,0 {
+                       compatible = "intel,82527"; // Bosch CC770
+                       reg = <2 0x0 0x100>;
+                       interrupts = <4 0>;
+                       interrupt-parent = <&mpic>;
+               };
+
+               can1@2,100 {
+                       compatible = "intel,82527"; // Bosch CC770
+                       reg = <2 0x100 0x100>;
+                       interrupts = <4 0>;
+                       interrupt-parent = <&mpic>;
+               };
+       };
+
        pci0: pci@e0008000 {
                cell-index = <0>;
                #interrupt-cells = <1>;