From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Dec 2018 04:08:34 +0000 (-0800)
Subject: Merge tag 'devicetree-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=030672aea826adf3dee9100ee8ac303b62c8fe7f;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'devicetree-for-4.21' of git://git./linux/kernel/git/robh/linux

Pull Devicetree updates from Rob Herring:
 "The biggest highlight here is the start of using json-schema for DT
  bindings. Being able to validate bindings has been discussed for years
  with little progress.

   - Initial support for DT bindings using json-schema language. This is
     the start of converting DT bindings from free-form text to a
     structured format.

   - Reworking of initrd address initialization. This moves to using the
     phys address instead of virt addr in the DT parsing code. This
     rework was motivated by CONFIG_DEV_BLK_INITRD causing unnecessary
     rebuilding of lots of files.

   - Fix stale phandle entries in phandle cache

   - DT overlay validation improvements. This exposed several memory
     leak bugs which have been fixed.

   - Use node name and device_type helper functions in DT code

   - Last remaining conversions to using %pOFn printk specifier instead
     of device_node.name directly

   - Create new common RTC binding doc and move all trivial RTC devices
     out of trivial-devices.txt.

   - New bindings for Freescale MAG3110 magnetometer, Cadence Sierra
     PHY, and Xen shared memory

   - Update dtc to upstream version v1.4.7-57-gf267e674d145"

* tag 'devicetree-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (68 commits)
  of: __of_detach_node() - remove node from phandle cache
  of: of_node_get()/of_node_put() nodes held in phandle cache
  gpio-omap.txt: add reg and interrupts properties
  dt-bindings: mrvl,intc: fix a trivial typo
  dt-bindings: iio: magnetometer: add dt-bindings for freescale mag3110
  dt-bindings: Convert trivial-devices.txt to json-schema
  dt-bindings: arm: mrvl: amend Browstone compatible string
  dt-bindings: arm: Convert Tegra board/soc bindings to json-schema
  dt-bindings: arm: Convert ZTE board/soc bindings to json-schema
  dt-bindings: arm: Add missing Xilinx boards
  dt-bindings: arm: Convert Xilinx board/soc bindings to json-schema
  dt-bindings: arm: Convert VIA board/soc bindings to json-schema
  dt-bindings: arm: Convert ST STi board/soc bindings to json-schema
  dt-bindings: arm: Convert SPEAr board/soc bindings to json-schema
  dt-bindings: arm: Convert CSR SiRF board/soc bindings to json-schema
  dt-bindings: arm: Convert QCom board/soc bindings to json-schema
  dt-bindings: arm: Convert TI nspire board/soc bindings to json-schema
  dt-bindings: arm: Convert TI davinci board/soc bindings to json-schema
  dt-bindings: arm: Convert Calxeda board/soc bindings to json-schema
  dt-bindings: arm: Convert Altera board/soc bindings to json-schema
  ...
---

030672aea826adf3dee9100ee8ac303b62c8fe7f
diff --cc arch/arm64/mm/init.c
index cbba537ba3d2,ecc316beec6d..a8f2e4792ef9
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@@ -59,28 -59,8 +59,10 @@@
   * that cannot be mistaken for a real physical address.
   */
  s64 memstart_addr __ro_after_init = -1;
 +EXPORT_SYMBOL(memstart_addr);
 +
  phys_addr_t arm64_dma_phys_limit __ro_after_init;
  
- #ifdef CONFIG_BLK_DEV_INITRD
- static int __init early_initrd(char *p)
- {
- 	unsigned long start, size;
- 	char *endp;
- 
- 	start = memparse(p, &endp);
- 	if (*endp == ',') {
- 		size = memparse(endp + 1, NULL);
- 
- 		initrd_start = start;
- 		initrd_end = start + size;
- 	}
- 	return 0;
- }
- early_param("initrd", early_initrd);
- #endif
- 
  #ifdef CONFIG_KEXEC_CORE
  /*
   * reserve_crashkernel() - reserves memory for crash kernel
diff --cc drivers/of/pdt.c
index c1633041621d,4fc0fd96ed04..d3185063d369
--- a/drivers/of/pdt.c
+++ b/drivers/of/pdt.c
@@@ -187,11 -202,10 +185,8 @@@ static struct device_node * __init of_p
  			ret = dp;
  		prev_sibling = dp;
  
 -		dp->full_name = of_pdt_build_full_name(dp);
 -
  		dp->child = of_pdt_build_tree(dp, of_pdt_prom_ops->getchild(node));
  
- 		if (of_pdt_build_more)
- 			of_pdt_build_more(dp);
- 
  		node = of_pdt_prom_ops->getsibling(node);
  	}