Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull minor devicetree bug fixes and documentation updates from Grant Likely:
"Fixes up a duplicate #include, adds an empty implementation of
of_find_compatible_node() and make git ignore .dtb files. And fix up
bus name on OF described PHYs. Nothing exciting here."
* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
doc: dt: Fix broken reference in gpio-leds documentation
of/mdio: fix fixed link bus name
of/fdt.c: asm/setup.h included twice
of: add picochip vendor prefix
dt: add empty of_find_compatible_node function
ARM: devicetree: Add .dtb files to arch/arm/boot/.gitignore
+14
-5
+3
-3
Documentation/devicetree/bindings/gpio/led.txt
+3
-3
Documentation/devicetree/bindings/gpio/led.txt
···
7
7
node's name represents the name of the corresponding LED.
8
8
9
9
LED sub-node properties:
10
-
- gpios : Should specify the LED's GPIO, see "Specifying GPIO information
11
-
for devices" in Documentation/devicetree/booting-without-of.txt. Active
12
-
low LEDs should be indicated using flags in the GPIO specifier.
10
+
- gpios : Should specify the LED's GPIO, see "gpios property" in
11
+
Documentation/devicetree/gpio.txt. Active low LEDs should be
12
+
indicated using flags in the GPIO specifier.
13
13
- label : (optional) The label for this LED. If omitted, the label is
14
14
taken from the node name (excluding the unit address).
15
15
- linux,default-trigger : (optional) This parameter, if present, is a
+1
Documentation/devicetree/bindings/vendor-prefixes.txt
+1
Documentation/devicetree/bindings/vendor-prefixes.txt
-1
drivers/of/fdt.c
-1
drivers/of/fdt.c
+1
-1
drivers/of/of_mdio.c
+1
-1
drivers/of/of_mdio.c
···
182
182
if (!phy_id || sz < sizeof(*phy_id))
183
183
return NULL;
184
184
185
-
sprintf(bus_id, PHY_ID_FMT, "0", be32_to_cpu(phy_id[0]));
185
+
sprintf(bus_id, PHY_ID_FMT, "fixed-0", be32_to_cpu(phy_id[0]));
186
186
187
187
phy = phy_connect(dev, bus_id, hndlr, 0, iface);
188
188
return IS_ERR(phy) ? NULL : phy;
+8
include/linux/of.h
+8
include/linux/of.h
···
281
281
return NULL;
282
282
}
283
283
284
+
static inline struct device_node *of_find_compatible_node(
285
+
struct device_node *from,
286
+
const char *type,
287
+
const char *compat)
288
+
{
289
+
return NULL;
290
+
}
291
+
284
292
static inline int of_property_read_u32_array(const struct device_node *np,
285
293
const char *propname,
286
294
u32 *out_values, size_t sz)