Commit 31f7c3a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux 

Pull device tree core updates from Grant Likely:
 "Generally minor changes.  A bunch of bug fixes, particularly for
  initialization and some refactoring.  Most notable change if feeding
  the entire flattened tree into the random pool at boot.  May not be
  significant, but shouldn't hurt either"

Tim Bird questions whether the boot time cost of the random feeding may
be noticeable.  And "add_device_randomness()" is definitely not some
speed deamon of a function.

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
  of/platform: add error reporting to of_amba_device_create()
  irq/of: Fix comment typo for irq_of_parse_and_map
  of: Feed entire flattened device tree into the random pool
  of/fdt: Clean up casting in unflattening path
  of/fdt: Remove duplicate memory clearing on FDT unflattening
  gpio: implement gpio-ranges binding document fix
  of: call __of_parse_phandle_with_args from of_parse_phandle
  of: introduce of_parse_phandle_with_fixed_args
  of: move of_parse_phandle()
  of: move documentation of of_parse_phandle_with_args
  of: Fix missing memory initialization on FDT unflattening
  of: consolidate definition of early_init_dt_alloc_memory_arch()
  of: Make of_get_phy_mode() return int i.s.o. const int
  include: dt-binding: input: create a DT header defining key codes.
  of/platform: Staticize of_platform_device_create_pdata()
  of: Specify initrd location using 64-bit
  dt: Typo fix
  OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled
parents ec5b103e 2bc552df

Documentation/devicetree/bindings/net/can/sja1000.txt

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Optional properties: 
	If not specified or if the specified value is 0, the CLKOUT pin

	will be disabled.



- nxp,no-comparator-bypass : Allows to disable the CAN input comperator.

- nxp,no-comparator-bypass : Allows to disable the CAN input comparator.



For further information, please have a look to the SJA1000 data sheet.

arch/arc/kernel/devtree.c

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ 
#include <asm/clk.h>

#include <asm/mach_desc.h>



/* called from unflatten_device_tree() to bootstrap devicetree itself */

void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)

{

	return __va(memblock_alloc(size, align));

}



/**

 * setup_machine_fdt - Machine setup when an dtb was passed to the kernel

 * @dt:		virtual address pointer to dt blob

arch/arc/mm/init.c

+2 −3
Original line number Diff line number Diff line
@@ -127,9 +127,8 @@ void __init free_initrd_mem(unsigned long start, unsigned long end) 
#endif



#ifdef CONFIG_OF_FLATTREE

void __init early_init_dt_setup_initrd_arch(unsigned long start,

					    unsigned long end)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

{

	pr_err("%s(%lx, %lx)\n", __func__, start, end);

	pr_err("%s(%llx, %llx)\n", __func__, start, end);

}

#endif /* CONFIG_OF_FLATTREE */

arch/arm/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int __init parse_tag_initrd2(const struct tag *tag) 
__tagtable(ATAG_INITRD2, parse_tag_initrd2);



#ifdef CONFIG_OF_FLATTREE

void __init early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

{

	phys_initrd_start = start;

	phys_initrd_size = end - start;

arch/arm64/kernel/setup.c

+0 −5
Original line number Diff line number Diff line
@@ -190,11 +190,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) 
	memblock_add(base, size);

}



void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)

{

	return __va(memblock_alloc(size, align));

}



/*

 * Limit the memory size that was specified via FDT.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE