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

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

Merge tag 'devicetree-for-3.16' of...

Merge tag 'devicetree-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next

Pull DeviceTree updates from Rob Herring:
 - Another round of clean-up of FDT related code in architecture code.
   This removes knowledge of internal FDT details from most
   architectures except powerpc.
 - Conversion of kernel's custom FDT parsing code to use libfdt.
 - DT based initialization for generic serial earlycon.  The
   introduction of generic serial earlycon support went in through the
   tty tree.
 - Improve the platform device naming for DT probed devices to ensure
   unique naming and use parent names instead of a global index.
 - Fix a race condition in of_update_property.
 - Unify the various linker section OF match tables and fix several
   function prototype errors.
 - Update platform_get_irq_byname to work in deferred probe cases.
 - 2 binding doc updates

* tag 'devicetree-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (58 commits)
  of: handle NULL node in next_child iterators
  of/irq: provide more wrappers for !CONFIG_OF
  devicetree: bindings: Document micrel vendor prefix
  dt: bindings: dwc2: fix required value for the phy-names property
  of_pci_irq: kill useless variable in of_irq_parse_pci()
  of/irq: do irq resolution in platform_get_irq_byname()
  of: Add a testcase for of_find_node_by_path()
  of: Make of_find_node_by_path() handle /aliases
  of: Create unlocked version of for_each_child_of_node()
  lib: add glibc style strchrnul() variant
  of: Handle memory@0 node on PPC32 only
  pci/of: Remove dead code
  of: fix race between search and remove in of_update_property()
  of: Use NULL for pointers
  of: Stop naming platform_device using dcr address
  of: Ensure unique names without sacrificing determinism
  tty/serial: pl011: add DT based earlycon support
  of/fdt: add FDT serial scanning for earlycon
  of/fdt: add FDT address translation support
  serial: earlycon: add DT support
  ...
parents b77279bc 43cb4367
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Refer to clk/clock-bindings.txt for generic clock consumer properties

Optional properties:
- phys: phy provider specifier
- phy-names: shall be "device"
- phy-names: shall be "usb2-phy"
Refer to phy/phy-bindings.txt for generic phy consumer properties

Example:
+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ lsi LSI Corp. (LSI Logic)
lltc	Linear Technology Corporation
marvell	Marvell Technology Group Ltd.
maxim	Maxim Integrated Products
micrel	Micrel Inc.
microchip	Microchip Technology Inc.
mosaixtech	Mosaix Technologies, Inc.
moxa	Moxa
+0 −1
Original line number Diff line number Diff line
@@ -12,6 +12,5 @@
#include <asm-generic/sections.h>

extern char __arc_dccm_base[];
extern char __dtb_start[];

#endif
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ const struct machine_desc * __init setup_machine_fdt(void *dt)
	const struct machine_desc *mdesc;
	unsigned long dt_root;
	void *clk;
	unsigned long len;
	int len;

	if (!early_init_dt_scan(dt))
		return NULL;
+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@
#ifdef CONFIG_OF

extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
extern void arm_dt_memblock_reserve(void);
extern void __init arm_dt_init_cpu_maps(void);

#else /* CONFIG_OF */
@@ -24,7 +23,6 @@ static inline const struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
	return NULL;
}

static inline void arm_dt_memblock_reserve(void) { }
static inline void arm_dt_init_cpu_maps(void) { }

#endif /* CONFIG_OF */
Loading