Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into...

diff --combined Documentation/powerpc/booting-without-of.txt
index e9690de93709ea6dff5675eb904750df392e0095,2efea2d497f8ed86f1dffbeb2f5859610ac38fe9..7b4e8a70882c2ff4fb4d61e4bc12a4987a7d06eb
--- 1/Documentation/powerpc/booting-without-of.txt
--- 2/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@@ -57,7 -57,6 +57,7 @@@ Table of Content
        n) 4xx/Axon EMAC ethernet nodes
        o) Xilinx IP cores
        p) Freescale Synchronous Serial Interface
 +        q) USB EHCI controllers
  
    VII - Specifying interrupt information for devices
      1) interrupts property
@@@ -2578,6 -2577,20 +2578,20 @@@ platforms are moved over to use the fla
        Requred properties:
         - current-speed : Baud rate of uartlite
  
+       v) Xilinx hwicap
+ 
+               Xilinx hwicap devices provide access to the configuration logic
+               of the FPGA through the Internal Configuration Access Port
+               (ICAP).  The ICAP enables partial reconfiguration of the FPGA,
+               readback of the configuration information, and some control over
+               'warm boots' of the FPGA fabric.
+ 
+               Required properties:
+               - xlnx,family : The family of the FPGA, necessary since the
+                       capabilities of the underlying ICAP hardware
+                       differ between different families.  May be
+                       'virtex2p', 'virtex4', or 'virtex5'.
+ 
      p) Freescale Synchronous Serial Interface
  
         The SSI is a serial device that communicates with audio codecs.  It can
@@@ -2776,33 -2789,6 +2790,33 @@@
                interrupt-parent = < &ipic >;
          };
  
 +    q) USB EHCI controllers
 +
 +    Required properties:
 +      - compatible : should be "usb-ehci".
 +      - reg : should contain at least address and length of the standard EHCI
 +        register set for the device. Optional platform-dependent registers
 +        (debug-port or other) can be also specified here, but only after
 +        definition of standard EHCI registers.
 +      - interrupts : one EHCI interrupt should be described here.
 +    If device registers are implemented in big endian mode, the device
 +    node should have "big-endian-regs" property.
 +    If controller implementation operates with big endian descriptors,
 +    "big-endian-desc" property should be specified.
 +    If both big endian registers and descriptors are used by the controller
 +    implementation, "big-endian" property can be specified instead of having
 +    both "big-endian-regs" and "big-endian-desc".
 +
 +     Example (Sequoia 440EPx):
 +          ehci@e0000300 {
 +                 compatible = "ibm,usb-ehci-440epx", "usb-ehci";
 +                 interrupt-parent = <&UIC0>;
 +                 interrupts = <1a 4>;
 +                 reg = <0 e0000300 90 0 e0000390 70>;
 +                 big-endian;
 +         };
 +
 +
     More devices will be defined as this spec matures.
  
  VII - Specifying interrupt information for devices