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

Commit 4c5811bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits)
  tty: serial: altera_jtaguart: Add device tree support
  tty: serial: altera_uart: Add devicetree support
  dt: eliminate of_platform_driver shim code
  dt: Eliminate of_platform_{,un}register_driver
  dt/serial: Eliminate users of of_platform_{,un}register_driver
  dt/usb: Eliminate users of of_platform_{,un}register_driver
  dt/video: Eliminate users of of_platform_{,un}register_driver
  dt/net: Eliminate users of of_platform_{,un}register_driver
  dt/sound: Eliminate users of of_platform_{,un}register_driver
  dt/spi: Eliminate users of of_platform_{,un}register_driver
  dt: uartlite: merge platform and of_platform driver bindings
  dt: xilinx_hwicap: merge platform and of_platform driver bindings
  ipmi: convert OF driver to platform driver
  leds/leds-gpio: merge platform_driver with of_platform_driver
  dt/sparc: Eliminate users of of_platform_{,un}register_driver
  dt/powerpc: Eliminate users of of_platform_{,un}register_driver
  dt/powerpc: move of_bus_type infrastructure to ibmebus
  drivercore/dt: add a match table pointer to struct device
  dt: Typo fix.
  altera_ps2: Add devicetree support
  ...
parents f74b9444 9f15444f

Documentation/devicetree/bindings/serial/altera_jtaguart.txt

0 → 100644
+4 −0
Original line number Diff line number Diff line 
Altera JTAG UART



Required properties:

- compatible : should be "ALTR,juart-1.0"

Documentation/devicetree/bindings/serial/altera_uart.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Altera UART



Required properties:

- compatible : should be "ALTR,uart-1.0"



Optional properties:

- clock-frequency : frequency of the clock input to the UART

Documentation/devicetree/bindings/serio/altera_ps2.txt

0 → 100644
+4 −0
Original line number Diff line number Diff line 
Altera UP PS/2 controller



Required properties:

- compatible : should be "ALTR,ps2-1.0".

arch/microblaze/pci/pci_32.c

+1 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ static void __devinit pcibios_scan_phb(struct pci_controller *hose) 
		       hose->global_number);

		return;

	}

	bus.dev->of_node = of_node_get(node);

	bus->secondary = hose->first_busno;

	hose->bus = bus;

arch/powerpc/include/asm/pci-bridge.h

+5 −22
Original line number Diff line number Diff line
@@ -164,13 +164,13 @@ extern void setup_indirect_pci(struct pci_controller* hose, 
			       resource_size_t cfg_addr,

			       resource_size_t cfg_data, u32 flags);



#ifndef CONFIG_PPC64



static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)

{

	return bus->sysdata;

}



#ifndef CONFIG_PPC64



static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)

{

	struct pci_controller *host;
@@ -228,19 +228,10 @@ extern void * update_dn_pci_info(struct device_node *dn, void *data); 


/* Get a device_node from a pci_dev.  This code must be fast except

 * in the case where the sysdata is incorrect and needs to be fixed

 * up (this will only happen once).

 * In this case the sysdata will have been inherited from a PCI host

 * bridge or a PCI-PCI bridge further up the tree, so it will point

 * to a valid struct pci_dn, just not the one we want.

 */

 * up (this will only happen once). */

static inline struct device_node *pci_device_to_OF_node(struct pci_dev *dev)

{

	struct device_node *dn = dev->sysdata;

	struct pci_dn *pdn = dn->data;



	if (pdn && pdn->devfn == dev->devfn && pdn->busno == dev->bus->number)

		return dn;	/* fast path.  sysdata is good */

	return fetch_dev_dn(dev);

	return dev->dev.of_node ? dev->dev.of_node : fetch_dev_dn(dev);

}



static inline int pci_device_from_OF_node(struct device_node *np,
@@ -258,7 +249,7 @@ static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus) 
	if (bus->self)

		return pci_device_to_OF_node(bus->self);

	else

		return bus->sysdata; /* Must be root bus (PHB) */

		return bus->dev.of_node; /* Must be root bus (PHB) */

}



/** Find the bus corresponding to the indicated device node */
@@ -270,14 +261,6 @@ extern void pcibios_remove_pci_devices(struct pci_bus *bus); 
/** Discover new pci devices under this bus, and add them */

extern void pcibios_add_pci_devices(struct pci_bus *bus);



static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)

{

	struct device_node *busdn = bus->sysdata;



	BUG_ON(busdn == NULL);

	return PCI_DN(busdn)->phb;

}





extern void isa_bridge_find_early(struct pci_controller *hose);