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

Commit 86ea51d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6 

* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  spi.h: missing kernel-doc notation, please fix
  of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers
  of: Fix missing includes
  ata: update for of_device to platform_device replacement
  microblaze: Fix of: eliminate of_device->node and dev_archdata->{of,prom}_node
  microblaze: Fix of/address: Merge all of the bus translation code
  booting-without-of: Remove nonexistent chapters from TOC, fix numbering
parents 3b89f567 5c79a5ae

Documentation/powerpc/booting-without-of.txt

+2 −29
Original line number Diff line number Diff line
@@ -49,40 +49,13 @@ Table of Contents 
      f) MDIO on GPIOs

      g) SPI busses



  VII - Marvell Discovery mv64[345]6x System Controller chips

    1) The /system-controller node

    2) Child nodes of /system-controller

      a) Marvell Discovery MDIO bus

      b) Marvell Discovery ethernet controller

      c) Marvell Discovery PHY nodes

      d) Marvell Discovery SDMA nodes

      e) Marvell Discovery BRG nodes

      f) Marvell Discovery CUNIT nodes

      g) Marvell Discovery MPSCROUTING nodes

      h) Marvell Discovery MPSCINTR nodes

      i) Marvell Discovery MPSC nodes

      j) Marvell Discovery Watch Dog Timer nodes

      k) Marvell Discovery I2C nodes

      l) Marvell Discovery PIC (Programmable Interrupt Controller) nodes

      m) Marvell Discovery MPP (Multipurpose Pins) multiplexing nodes

      n) Marvell Discovery GPP (General Purpose Pins) nodes

      o) Marvell Discovery PCI host bridge node

      p) Marvell Discovery CPU Error nodes

      q) Marvell Discovery SRAM Controller nodes

      r) Marvell Discovery PCI Error Handler nodes

      s) Marvell Discovery Memory Controller nodes



  VIII - Specifying interrupt information for devices

  VII - Specifying interrupt information for devices

    1) interrupts property

    2) interrupt-parent property

    3) OpenPIC Interrupt Controllers

    4) ISA Interrupt Controllers



  IX - Specifying GPIO information for devices

    1) gpios property

    2) gpio-controller nodes



  X - Specifying device power management information (sleep property)

  VIII - Specifying device power management information (sleep property)



  Appendix A - Sample SOC node for MPC8540

arch/microblaze/kernel/prom_parse.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) 
		/* We can only get here if we hit a P2P bridge with no node,

		 * let's do standard swizzling and try again

		 */

		lspec = of_irq_pci_swizzle(PCI_SLOT(pdev->devfn), lspec);

		lspec = pci_swizzle_interrupt_pin(pdev, lspec);

		pdev = ppdev;

	}

arch/microblaze/pci/pci-common.c

+3 −2
Original line number Diff line number Diff line
@@ -27,10 +27,11 @@ 
#include <linux/irq.h>

#include <linux/vmalloc.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of_address.h>



#include <asm/processor.h>

#include <asm/io.h>

#include <asm/prom.h>

#include <asm/pci-bridge.h>

#include <asm/byteorder.h>
@@ -1077,7 +1078,7 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) 
		struct dev_archdata *sd = &dev->dev.archdata;



		/* Setup OF node pointer in archdata */

		sd->of_node = pci_device_to_OF_node(dev);

		dev->dev.of_node = pci_device_to_OF_node(dev);



		/* Fixup NUMA node as it may not be setup yet by the generic

		 * code and is needed by the DMA init

arch/microblaze/pci/xilinx_pci.c

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


#include <linux/ioport.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/pci.h>

#include <asm/io.h>

drivers/ata/sata_dwc_460ex.c

+2 −2
Original line number Diff line number Diff line
@@ -1588,7 +1588,7 @@ static const struct ata_port_info sata_dwc_port_info[] = { 
	},

};



static int sata_dwc_probe(struct of_device *ofdev,

static int sata_dwc_probe(struct platform_device *ofdev,

			const struct of_device_id *match)

{

	struct sata_dwc_device *hsdev;
@@ -1702,7 +1702,7 @@ static int sata_dwc_probe(struct of_device *ofdev, 
	return err;

}



static int sata_dwc_remove(struct of_device *ofdev)

static int sata_dwc_remove(struct platform_device *ofdev)

{

	struct device *dev = &ofdev->dev;

	struct ata_host *host = dev_get_drvdata(dev);