Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ab3e84f authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

parents 52b80482 256ae6a7

Documentation/powerpc/booting-without-of.txt

+42 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ Table of Contents 
      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
@@ -2577,6 +2578,20 @@ platforms are moved over to use the flattened-device-tree model. 
      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
@@ -2775,6 +2790,33 @@ platforms are moved over to use the flattened-device-tree model. 
		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

arch/powerpc/boot/dts/sequoia.dts

+8 −0
Original line number Diff line number Diff line
@@ -138,6 +138,14 @@ 
			interrupts = <15 8>;

		};



		USB0: ehci@e0000300 {

			compatible = "ibm,usb-ehci-440epx", "usb-ehci";

			interrupt-parent = <&UIC0>;

			interrupts = <1a 4>;

			reg = <0 e0000300 90 0 e0000390 70>;

			big-endian;

		};



		POB0: opb {

		  	compatible = "ibm,opb-440epx", "ibm,opb";

			#address-cells = <1>;

arch/powerpc/platforms/40x/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ config WALNUT 
	default y

	select 405GP

	select PCI

	select OF_RTC

	help

	  This option enables support for the IBM PPC405GP evaluation board.

arch/powerpc/platforms/40x/virtex.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int __init virtex_probe(void) 
{

	unsigned long root = of_get_flat_dt_root();



	if (!of_flat_dt_is_compatible(root, "xilinx,virtex"))

	if (!of_flat_dt_is_compatible(root, "xlnx,virtex"))

		return 0;



	return 1;

arch/powerpc/platforms/40x/walnut.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <linux/init.h>

#include <linux/of_platform.h>

#include <linux/rtc.h>



#include <asm/machdep.h>

#include <asm/prom.h>