diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 16:44:08 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 16:44:08 (GMT) |
| commit | a54dfb1a845c38a97686268d8c4086a63d9493aa (patch) | |
| tree | 3b31c81672fa89102aae929cc6c1e48e6e9382f4 /include/linux | |
| parent | eb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7 (diff) | |
| parent | 36165f55055781a0e4bf32d775241796414504b0 (diff) | |
| download | linux-fsl-qoriq-a54dfb1a845c38a97686268d8c4086a63d9493aa.tar.xz | |
Merge tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux
Pull devicetree updates from Rob Herring:
- Import of latest upstream device tree compiler (dtc)
- New function of_get_child_by_name
- Support for #size-cells of 0 and #addr-cells of >2
- Couple of DT binding documentation updates
Fix up trivial conflicts due to of_get_child_by_name() having been added
next to the new of_get_next_available_child().
* tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux:
MAINTAINERS: add scripts/dtc under Devicetree maintainers
dtc: import latest upstream dtc
dt: Document general interrupt controller bindings
dt/s3c64xx/spi: Use of_get_child_by_name to get a named child
dt: introduce of_get_child_by_name to get child node by name
of: i2c: add support for wakeup-source property
of/address: Handle #address-cells > 2 specially
DT: export of_irq_to_resource_table()
devicetree: serial: Add documentation for imx serial
devicetree: pwm: mxs-pwm.txt: Fix reg field annotation
of: Allow busses with #size-cells=0
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of.h | 2 | ||||
| -rw-r--r-- | include/linux/of_address.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 1b11632..f594c52 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -193,6 +193,8 @@ extern struct device_node *of_get_next_child(const struct device_node *node, extern struct device_node *of_get_next_available_child( const struct device_node *node, struct device_node *prev); +extern struct device_node *of_get_child_by_name(const struct device_node *node, + const char *name); #define for_each_child_of_node(parent, child) \ for (child = of_get_next_child(parent, NULL); child != NULL; \ child = of_get_next_child(parent, child)) diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 01b925a..c3cdc10 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -6,6 +6,7 @@ #ifdef CONFIG_OF_ADDRESS extern u64 of_translate_address(struct device_node *np, const __be32 *addr); +extern bool of_can_translate_address(struct device_node *dev); extern int of_address_to_resource(struct device_node *dev, int index, struct resource *r); extern struct device_node *of_find_matching_node_by_address( |