Commit 8181780c 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:
  dt: include linux/errno.h in linux/of_address.h
  of/address: Add of_find_matching_node_by_address helper
  dt: remove extra xsysace platform_driver registration
  tty/serial: Add devicetree support for nVidia Tegra serial ports
  dt: add empty of_property_read_u32[_array] for non-dt
  dt: bindings: move SEC node under new crypto/
  dt: add helper function to read u32 arrays
  tty/serial: change of_serial to use new of_property_read_u32() api
  dt: add 'const' for of_property_read_string parameter **out_string
  dt: add helper functions to read u32 and string property values
  tty: of_serial: support for 32 bit accesses
  dt: document the of_serial bindings
  dt/platform: allow device name to be overridden
  drivers/amba: create devices from device tree
  dt: add of_platform_populate() for creating device from the device tree
  dt: Add default match table for bus ids
parents 7235dd74 99ce39e3

Documentation/devicetree/bindings/arm/primecell.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
* ARM Primecell Peripherals



ARM, Ltd. Primecell peripherals have a standard id register that can be used to

identify the peripheral type, vendor, and revision. This value can be used for

driver matching.



Required properties:



- compatible : should be a specific value for peripheral and "arm,primecell"



Optional properties:



- arm,primecell-periphid : Value to override the h/w value with



Example:



serial@fff36000 {

	compatible = "arm,pl011", "arm,primecell";

	arm,primecell-periphid = <0x00341011>;

};

Documentation/devicetree/bindings/powerpc/fsl/sec.txt→Documentation/devicetree/bindings/crypto/fsl-sec2.txt

+1 −1
Original line number Diff line number Diff line 
Freescale SoC SEC Security Engines

Freescale SoC SEC Security Engines versions 2.x-3.x



Required properties:

Documentation/devicetree/bindings/tty/serial/of-serial.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
* UART (Universal Asynchronous Receiver/Transmitter)



Required properties:

- compatible : one of:

	- "ns8250"

	- "ns16450"

	- "ns16550a"

	- "ns16550"

	- "ns16750"

	- "ns16850"

	- "nvidia,tegra20-uart"

	- "ibm,qpace-nwp-serial"

	- "serial" if the port type is unknown.

- reg : offset and length of the register set for the device.

- interrupts : should contain uart interrupt.

- clock-frequency : the input clock frequency for the UART.



Optional properties:

- current-speed : the current active speed of the UART.

- reg-offset : offset to apply to the mapbase from the start of the registers.

- reg-shift : quantity to shift the register offsets by.

- reg-io-width : the size (in bytes) of the IO accesses that should be

  performed on the device.  There are some systems that require 32-bit

  accesses to the UART (e.g. TI davinci).

- used-by-rtas : set to indicate that the port is in use by the OpenFirmware

  RTAS and should not be registered.



Example:



	uart@80230000 {

		compatible = "ns8250";

		reg = <0x80230000 0x100>;

		clock-frequency = <3686400>;

		interrupts = <10>;

		reg-shift = <2>;

	};

drivers/block/xsysace.c

+16 −82
Original line number Diff line number Diff line
@@ -1155,12 +1155,19 @@ static int __devinit ace_probe(struct platform_device *dev) 
{

	resource_size_t physaddr = 0;

	int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */

	int id = dev->id;

	u32 id = dev->id;

	int irq = NO_IRQ;

	int i;



	dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);



	/* device id and bus width */

	of_property_read_u32(dev->dev.of_node, "port-number", &id);

	if (id < 0)

		id = 0;

	if (of_find_property(dev->dev.of_node, "8-bit", NULL))

		bus_width = ACE_BUS_WIDTH_8;



	for (i = 0; i < dev->num_resources; i++) {

		if (dev->resource[i].flags & IORESOURCE_MEM)

			physaddr = dev->resource[i].start;
@@ -1181,57 +1188,7 @@ static int __devexit ace_remove(struct platform_device *dev) 
	return 0;

}



static struct platform_driver ace_platform_driver = {

	.probe = ace_probe,

	.remove = __devexit_p(ace_remove),

	.driver = {

		.owner = THIS_MODULE,

		.name = "xsysace",

	},

};



/* ---------------------------------------------------------------------

 * OF_Platform Bus Support

 */



#if defined(CONFIG_OF)

static int __devinit ace_of_probe(struct platform_device *op)

{

	struct resource res;

	resource_size_t physaddr;

	const u32 *id;

	int irq, bus_width, rc;



	/* device id */

	id = of_get_property(op->dev.of_node, "port-number", NULL);



	/* physaddr */

	rc = of_address_to_resource(op->dev.of_node, 0, &res);

	if (rc) {

		dev_err(&op->dev, "invalid address\n");

		return rc;

	}

	physaddr = res.start;



	/* irq */

	irq = irq_of_parse_and_map(op->dev.of_node, 0);



	/* bus width */

	bus_width = ACE_BUS_WIDTH_16;

	if (of_find_property(op->dev.of_node, "8-bit", NULL))

		bus_width = ACE_BUS_WIDTH_8;



	/* Call the bus-independent setup code */

	return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0,

						physaddr, irq, bus_width);

}



static int __devexit ace_of_remove(struct platform_device *op)

{

	ace_free(&op->dev);

	return 0;

}



/* Match table for of_platform binding */

static const struct of_device_id ace_of_match[] __devinitconst = {

	{ .compatible = "xlnx,opb-sysace-1.00.b", },
@@ -1241,34 +1198,20 @@ static const struct of_device_id ace_of_match[] __devinitconst = { 
	{},

};

MODULE_DEVICE_TABLE(of, ace_of_match);

#else /* CONFIG_OF */

#define ace_of_match NULL

#endif /* CONFIG_OF */



static struct platform_driver ace_of_driver = {

	.probe = ace_of_probe,

	.remove = __devexit_p(ace_of_remove),

static struct platform_driver ace_platform_driver = {

	.probe = ace_probe,

	.remove = __devexit_p(ace_remove),

	.driver = {

		.name = "xsysace",

		.owner = THIS_MODULE,

		.name = "xsysace",

		.of_match_table = ace_of_match,

	},

};



/* Registration helpers to keep the number of #ifdefs to a minimum */

static inline int __init ace_of_register(void)

{

	pr_debug("xsysace: registering OF binding\n");

	return platform_driver_register(&ace_of_driver);

}



static inline void __exit ace_of_unregister(void)

{

	platform_driver_unregister(&ace_of_driver);

}

#else /* CONFIG_OF */

/* CONFIG_OF not enabled; do nothing helpers */

static inline int __init ace_of_register(void) { return 0; }

static inline void __exit ace_of_unregister(void) { }

#endif /* CONFIG_OF */



/* ---------------------------------------------------------------------

 * Module init/exit routines

 */
@@ -1282,11 +1225,6 @@ static int __init ace_init(void) 
		goto err_blk;

	}



	rc = ace_of_register();

	if (rc)

		goto err_of;



	pr_debug("xsysace: registering platform binding\n");

	rc = platform_driver_register(&ace_platform_driver);

	if (rc)

		goto err_plat;
@@ -1295,21 +1233,17 @@ static int __init ace_init(void) 
	return 0;



err_plat:

	ace_of_unregister();

err_of:

	unregister_blkdev(ace_major, "xsysace");

err_blk:

	printk(KERN_ERR "xsysace: registration failed; err=%i\n", rc);

	return rc;

}

module_init(ace_init);



static void __exit ace_exit(void)

{

	pr_debug("Unregistering Xilinx SystemACE driver\n");

	platform_driver_unregister(&ace_platform_driver);

	ace_of_unregister();

	unregister_blkdev(ace_major, "xsysace");

}



module_init(ace_init);

module_exit(ace_exit);

drivers/of/address.c

+18 −0
Original line number Diff line number Diff line
@@ -577,6 +577,24 @@ int of_address_to_resource(struct device_node *dev, int index, 
}

EXPORT_SYMBOL_GPL(of_address_to_resource);



struct device_node *of_find_matching_node_by_address(struct device_node *from,

					const struct of_device_id *matches,

					u64 base_address)

{

	struct device_node *dn = of_find_matching_node(from, matches);

	struct resource res;



	while (dn) {

		if (of_address_to_resource(dn, 0, &res))

			continue;

		if (res.start == base_address)

			return dn;

		dn = of_find_matching_node(dn, matches);

	}



	return NULL;

}





/**

 * of_iomap - Maps the memory mapped IO for a given device_node

CRA Git | Maintained and supported by SUSTech CRA and CCSE