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

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

Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux 

Pull devicetree updates from Rob Herring:
 "A small set of changes for devicetree:
   - Couple of Documentation fixes
   - Addition of new helper function of_node_full_name
   - Improve of_parse_phandle_with_args return values
   - Some NULL related sparse fixes"

Grant's busy packing.

* tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux:
  of: mtd: nuke useless const qualifier
  devicetree: add helper inline for retrieving a node's full name
  of: return -ENOENT when no property
  usage-model.txt: fix typo machine_init->init_machine
  of: Fix null pointer related warnings in base.c file
  LED: Fix missing semicolon in OF documentation
  of: fix a few typos in the binding documentation
parents 914311c9 e95d8aaf

Documentation/devicetree/bindings/gpio/led.txt

+1 −1
Original line number Diff line number Diff line
@@ -55,4 +55,4 @@ run-control { 
		gpios = <&mpc8572 7 0>;

		default-state = "on";

	};

}
 
};

Documentation/devicetree/bindings/mtd/partition.txt

+1 −1
Original line number Diff line number Diff line
@@ -35,4 +35,4 @@ flash@0 { 
	uimage@100000 {

		reg = <0x0100000 0x200000>;

	};

];
 
};

Documentation/devicetree/usage-model.txt

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ device tree for the NVIDIA Tegra board. 
	};

};



At .machine_init() time, Tegra board support code will need to look at

At .init_machine() time, Tegra board support code will need to look at

this DT and decide which nodes to create platform_devices for.

However, looking at the tree, it is not immediately obvious what kind

of device each node represents, or even if a node represents a device

arch/microblaze/pci/pci-common.c

+2 −4
Original line number Diff line number Diff line
@@ -249,8 +249,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev) 
	} else {

		pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",

			 oirq.size, oirq.specifier[0], oirq.specifier[1],

			 oirq.controller ? oirq.controller->full_name :

			 "<default>");

			 of_node_full_name(oirq.controller));



		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,

					     oirq.size);
@@ -1493,8 +1492,7 @@ static void __devinit pcibios_scan_phb(struct pci_controller *hose) 
	struct pci_bus *bus;

	struct device_node *node = hose->dn;



	pr_debug("PCI: Scanning PHB %s\n",

		 node ? node->full_name : "<NO NAME>");

	pr_debug("PCI: Scanning PHB %s\n", of_node_full_name(node));



	pcibios_setup_phb_resources(hose, &resources);

arch/powerpc/kernel/pci-common.c

+2 −4
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ static int pci_read_irq_line(struct pci_dev *pci_dev) 
	} else {

		pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",

			 oirq.size, oirq.specifier[0], oirq.specifier[1],

			 oirq.controller ? oirq.controller->full_name :

			 "<default>");

			 of_node_full_name(oirq.controller));



		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,

					     oirq.size);
@@ -1628,8 +1627,7 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose) 
	struct device_node *node = hose->dn;

	int mode;



	pr_debug("PCI: Scanning PHB %s\n",

		 node ? node->full_name : "<NO NAME>");

	pr_debug("PCI: Scanning PHB %s\n", of_node_full_name(node));



	/* Get some IO space for the new PHB */

	pcibios_setup_phb_io_space(hose);