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

Commit ee0849c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7d77696e 29f141fe

Documentation/devicetree/bindings/gpio/led.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -7,9 +7,9 @@ Each LED is represented as a sub-node of the gpio-leds device. Each 
node's name represents the name of the corresponding LED.

node's name represents the name of the corresponding LED.





LED sub-node properties:

LED sub-node properties:

- gpios :  Should specify the LED's GPIO, see "Specifying GPIO information

- gpios :  Should specify the LED's GPIO, see "gpios property" in

  for devices" in Documentation/devicetree/booting-without-of.txt.  Active

  Documentation/devicetree/gpio.txt.  Active low LEDs should be

  low LEDs should be indicated using flags in the GPIO specifier.

  indicated using flags in the GPIO specifier.

- label :  (optional) The label for this LED.  If omitted, the label is

- label :  (optional) The label for this LED.  If omitted, the label is

  taken from the node name (excluding the unit address).

  taken from the node name (excluding the unit address).

- linux,default-trigger :  (optional) This parameter, if present, is a

- linux,default-trigger :  (optional) This parameter, if present, is a

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ national National Semiconductor 
nintendo	Nintendo

nintendo	Nintendo

nvidia	NVIDIA

nvidia	NVIDIA

nxp	NXP Semiconductors

nxp	NXP Semiconductors

picochip	Picochip Ltd

powervr	Imagination Technologies

powervr	Imagination Technologies

qcom	Qualcomm, Inc.

qcom	Qualcomm, Inc.

ramtron	Ramtron International

ramtron	Ramtron International

arch/arm/boot/.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -3,3 +3,4 @@ zImage 
xipImage

xipImage

bootpImage

bootpImage

uImage

uImage

*.dtb

drivers/of/fdt.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <asm/machdep.h>

#include <asm/machdep.h>

#endif /* CONFIG_PPC */

#endif /* CONFIG_PPC */





#include <asm/setup.h>

#include <asm/page.h>

#include <asm/page.h>





char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)

char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)

drivers/of/of_mdio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, 
	if (!phy_id || sz < sizeof(*phy_id))

	if (!phy_id || sz < sizeof(*phy_id))

		return NULL;

		return NULL;





	sprintf(bus_id, PHY_ID_FMT, "0", be32_to_cpu(phy_id[0]));

	sprintf(bus_id, PHY_ID_FMT, "fixed-0", be32_to_cpu(phy_id[0]));





	phy = phy_connect(dev, bus_id, hndlr, 0, iface);

	phy = phy_connect(dev, bus_id, hndlr, 0, iface);

	return IS_ERR(phy) ? NULL : phy;

	return IS_ERR(phy) ? NULL : phy;