Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull DeviceTree updates from Rob Herring:
 "A bigger diffstat than usual with the kbuild changes and a tree wide
  fix in the binding documentation.

  Summary:

   - kbuild cleanups and improvements for dtbs

   - Code clean-up of overlay code and fixing for some long standing
     memory leak and race condition in applying overlays

   - Improvements to DT memory usage making sysfs/kobjects optional and
     skipping unflattening of disabled nodes. This is part of kernel
     tinification efforts.

   - Final piece of removing storing the full path for every DT node.
     The prerequisite conversion of printk's to use device_node format
     specifier happened in 4.14.

   - Sync with current upstream dtc. This brings additional checks to
     dtb compiling.

   - Binding doc tree wide removal of leading 0s from examples

   - RTC binding documentation adding missing devices and some
     consolidation of duplicated bindings

   - Vendor prefix documentation for nutsboard, Silicon Storage
     Technology, shimafuji, Tecon Microprocessor Technologies, DH
     electronics GmbH, Opal Kelly, and Next Thing"

* tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (55 commits)
  dt-bindings: usb: add #phy-cells to usb-nop-xceiv
  dt-bindings: Remove leading zeros from bindings notation
  kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in Makefile.lib
  MIPS: dts: remove bogus bcm96358nb4ser.dtb from dtb-y entry
  kbuild: clean up *.dtb and *.dtb.S patterns from top-level Makefile
  .gitignore: move *.dtb and *.dtb.S patterns to the top-level .gitignore
  .gitignore: sort normal pattern rules alphabetically
  dt-bindings: add vendor prefix for Next Thing Co.
  scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9
  of: dynamic: fix memory leak related to properties of __of_node_dup
  of: overlay: make pr_err() string unique
  of: overlay: pr_err from return NOTIFY_OK to overlay apply/remove
  of: overlay: remove unneeded check for NULL kbasename()
  of: overlay: remove a dependency on device node full_name
  of: overlay: simplify applying symbols from an overlay
  of: overlay: avoid race condition between applying multiple overlays
  of: overlay: loosen overly strict phandle clash check
  of: overlay: expand check of whether overlay changeset can be removed
  of: overlay: detect cases where device tree may become corrupt
  of: overlay: minor restructuring
  ...

diff --cc Documentation/devicetree/bindings/dma/sun6i-dma.txt
Simple merge

diff --cc Documentation/devicetree/bindings/mmc/mmc.txt
Simple merge

diff --cc Documentation/devicetree/bindings/trivial-devices.txt
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 9f4c3dfbe49b75de24070f91409bc2e51f4a27df,b2c1b8d80367ec279e41b7ff3f5774703b86535a..0f295a4798ad3de79de775573fb7cd5770de1e2e
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -246,8 -248,8 +249,9 @@@ olimex     OLIMEX Ltd
  onion Onion Corporation
  onnn  ON Semiconductor Corp.
  ontat On Tat Industrial Company
+ opalkelly     Opal Kelly Incorporated
  opencores     OpenCores.org
 +openrisc      OpenRISC.io
  option        Option NV
  ORCL  Oracle Corporation
  ortustech     Ortus Technology Co., Ltd.

diff --cc Documentation/kbuild/makefiles.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arc/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/Makefile
index c6684ab8e201fc5dca8ce29726e8b3d8508e6fbd,a7ecb42e84e639126325ed74dabf37858dfeffea..d7c22d51bc5073c13b17143d314e49728bcd3220
--- 1/arch/arm64/boot/dts/Makefile
--- 2/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -1,34 -1,25 +1,26 @@@
- dts-dirs += actions
- dts-dirs += al
- dts-dirs += allwinner
- dts-dirs += altera
- dts-dirs += amd
- dts-dirs += amlogic
- dts-dirs += apm
- dts-dirs += arm
- dts-dirs += broadcom
- dts-dirs += cavium
- dts-dirs += exynos
- dts-dirs += freescale
- dts-dirs += hisilicon
- dts-dirs += marvell
- dts-dirs += mediatek
- dts-dirs += nvidia
- dts-dirs += qcom
- dts-dirs += realtek
- dts-dirs += renesas
- dts-dirs += rockchip
- dts-dirs += socionext
- dts-dirs += sprd
- dts-dirs += xilinx
- dts-dirs += lg
- dts-dirs += zte
- 
- subdir-y      := $(dts-dirs)
- 
- dtstree               := $(srctree)/$(src)
- 
- dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts)))
- 
- always                := $(dtb-y)
 +# SPDX-License-Identifier: GPL-2.0
+ subdir-y += actions
+ subdir-y += al
+ subdir-y += allwinner
+ subdir-y += altera
+ subdir-y += amd
+ subdir-y += amlogic
+ subdir-y += apm
+ subdir-y += arm
+ subdir-y += broadcom
+ subdir-y += cavium
+ subdir-y += exynos
+ subdir-y += freescale
+ subdir-y += hisilicon
+ subdir-y += marvell
+ subdir-y += mediatek
+ subdir-y += nvidia
+ subdir-y += qcom
+ subdir-y += realtek
+ subdir-y += renesas
+ subdir-y += rockchip
+ subdir-y += socionext
+ subdir-y += sprd
+ subdir-y += xilinx
+ subdir-y += lg
+ subdir-y += zte

diff --cc arch/arm64/boot/dts/allwinner/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/amd/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/amlogic/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/apm/Makefile
index a10fbdb34229c0fff83400bfaa3e7cc5043c4469,b96cd388ca7b9da25dc376a0c40724475ae82d09..55b5cdca13b8f9a40335eaa6fbbb8a628f5cbbb8
--- 1/arch/arm64/boot/dts/apm/Makefile
--- 2/arch/arm64/boot/dts/apm/Makefile
+++ b/arch/arm64/boot/dts/apm/Makefile
@@@ -1,7 -1,2 +1,3 @@@
 +# SPDX-License-Identifier: GPL-2.0
  dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
  dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb
- 
- always                := $(dtb-y)
- subdir-y      := $(dts-dirs)
- clean-files   := *.dtb

diff --cc arch/arm64/boot/dts/arm/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/broadcom/Makefile
index 3df2db7f88786eda0740067dbfe2aa5b22823b6d,da268c69787fc38deeacb07c55e87f5653e5c945..2a2591ef1feedb183573fb1753603293db9da622
--- 1/arch/arm64/boot/dts/broadcom/Makefile
--- 2/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@@ -1,8 -1,4 +1,5 @@@
 +# SPDX-License-Identifier: GPL-2.0
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
  
- dts-dirs      += northstar2
- dts-dirs      += stingray
- always                := $(dtb-y)
- subdir-y      := $(dts-dirs)
- clean-files   := *.dtb
+ subdir-y      += northstar2
+ subdir-y      += stingray

diff --cc arch/arm64/boot/dts/broadcom/stingray/Makefile
index 04bb302f323305ac92be635f51886182b0e013fa,ea5516b1f6dac06573e17d8b3add61028b1d53fe..c4d06cffcb119d8119c80e3fa233656b32a143a3
--- 1/arch/arm64/boot/dts/broadcom/stingray/Makefile
--- 2/arch/arm64/boot/dts/broadcom/stingray/Makefile
+++ b/arch/arm64/boot/dts/broadcom/stingray/Makefile
@@@ -1,7 -1,2 +1,3 @@@
 +# SPDX-License-Identifier: GPL-2.0
  dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742k.dtb
  dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742t.dtb
- 
- always                := $(dtb-y)
- subdir-y      := $(dts-dirs)
- clean-files   := *.dtb

diff --cc arch/arm64/boot/dts/cavium/Makefile
index 9f68c277302b2523d2bc37f7d96fea3b2255473b,f7c0ca8d306011f56ef271cf1d6efe87c6bd3ba8..c178f7e06e18e016d0ab6ee034862e230af043ad
--- 1/arch/arm64/boot/dts/cavium/Makefile
--- 2/arch/arm64/boot/dts/cavium/Makefile
+++ b/arch/arm64/boot/dts/cavium/Makefile
@@@ -1,7 -1,2 +1,3 @@@
 +# SPDX-License-Identifier: GPL-2.0
  dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
  dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb
- 
- always                := $(dtb-y)
- subdir-y      := $(dts-dirs)
- clean-files   := *.dtb

diff --cc arch/arm64/boot/dts/exynos/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/freescale/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/hisilicon/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/lg/Makefile
index e345b8e58efe5795eff03fa756a143a80096f001,de5dc19b59fff569e0683064e1ebdb5b00a7968d..4c3959e24e1bafce9306a5a02fe5e1fa33479b1f
--- 1/arch/arm64/boot/dts/lg/Makefile
--- 2/arch/arm64/boot/dts/lg/Makefile
+++ b/arch/arm64/boot/dts/lg/Makefile
@@@ -1,7 -1,2 +1,3 @@@
 +# SPDX-License-Identifier: GPL-2.0
  dtb-$(CONFIG_ARCH_LG1K) += lg1312-ref.dtb
  dtb-$(CONFIG_ARCH_LG1K) += lg1313-ref.dtb
- 
- always                := $(dtb-y)
- subdir-y      := $(dts-dirs)
- clean-files   := *.dtb

diff --cc arch/arm64/boot/dts/marvell/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/mediatek/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/nvidia/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/qcom/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/renesas/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/rockchip/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/socionext/Makefile
Simple merge

diff --cc arch/arm64/boot/dts/sprd/Makefile
index d7188be103c5b3c4d805bb7133566ae117b82114,38cefdb115a8893c1c4a68385be7daa2f87fdf86..2bdc23804f40eda34b2bb1d9ee8a197cb12df170
--- 1/arch/arm64/boot/dts/sprd/Makefile
--- 2/arch/arm64/boot/dts/sprd/Makefile
+++ b/arch/arm64/boot/dts/sprd/Makefile
@@@ -1,7 -1,2 +1,3 @@@
 +# SPDX-License-Identifier: GPL-2.0
  dtb-$(CONFIG_ARCH_SPRD) += sc9836-openphone.dtb \
                        sp9860g-1h10.dtb
- 
- always                := $(dtb-y)
- subdir-y      := $(dts-dirs)
- clean-files   := *.dtb

diff --cc arch/c6x/boot/dts/Makefile
Simple merge

diff --cc arch/cris/boot/dts/Makefile
Simple merge

diff --cc arch/h8300/boot/dts/Makefile
Simple merge

diff --cc arch/metag/boot/dts/Makefile
Simple merge

diff --cc arch/microblaze/boot/Makefile
Simple merge

diff --cc arch/mips/boot/dts/Makefile
index e0a4e939f843f48170c4f9a2f3da4b62bd1bfb7f,bc4ce85db136678a7ad4f8c867f3b29d64309909..e2c6f131c8ebbd5bdd3db36b89ddb44ca1aa4423
--- 1/arch/mips/boot/dts/Makefile
--- 2/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@@ -1,22 -1,14 +1,15 @@@
- dts-dirs      += brcm
- dts-dirs      += cavium-octeon
- dts-dirs      += img
- dts-dirs      += ingenic
- dts-dirs      += lantiq
- dts-dirs      += mti
- dts-dirs      += netlogic
- dts-dirs      += ni
- dts-dirs      += pic32
- dts-dirs      += qca
- dts-dirs      += ralink
- dts-dirs      += xilfpga
 +# SPDX-License-Identifier: GPL-2.0
+ subdir-y      += brcm
+ subdir-y      += cavium-octeon
+ subdir-y      += img
+ subdir-y      += ingenic
+ subdir-y      += lantiq
+ subdir-y      += mti
+ subdir-y      += netlogic
+ subdir-y      += ni
+ subdir-y      += pic32
+ subdir-y      += qca
+ subdir-y      += ralink
+ subdir-y      += xilfpga
  
- obj-y         := $(addsuffix /, $(dts-dirs))
- 
- dtstree               := $(srctree)/$(src)
- dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts)))
- 
- always                := $(dtb-y)
- subdir-y      := $(dts-dirs)
- clean-files   := *.dtb *.dtb.S
+ obj-$(CONFIG_BUILTIN_DTB)     := $(addsuffix /, $(subdir-y))

diff --cc arch/mips/boot/dts/brcm/Makefile
Simple merge

diff --cc arch/mips/boot/dts/cavium-octeon/Makefile
Simple merge

diff --cc arch/mips/boot/dts/img/Makefile
Simple merge

diff --cc arch/mips/boot/dts/ingenic/Makefile
Simple merge

diff --cc arch/mips/boot/dts/lantiq/Makefile
Simple merge

diff --cc arch/mips/boot/dts/mti/Makefile
Simple merge

diff --cc arch/mips/boot/dts/netlogic/Makefile
Simple merge

diff --cc arch/mips/boot/dts/pic32/Makefile
Simple merge

diff --cc arch/mips/boot/dts/qca/Makefile
Simple merge

diff --cc arch/mips/boot/dts/ralink/Makefile
Simple merge

diff --cc arch/mips/boot/dts/xilfpga/Makefile
Simple merge

diff --cc arch/openrisc/boot/dts/Makefile
Simple merge

diff --cc arch/powerpc/boot/Makefile
Simple merge

diff --cc arch/powerpc/platforms/pseries/dlpar.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/of/Makefile
index 8f19d342eed8e0646d0019f872eb3d24d066d08c,83d61a7c5e82d013fc16bc80d45b556fee15b5a9..63a4be62ce19a8fb661fad9286a04f66a227fddf
--- 1/drivers/of/Makefile
--- 2/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@@ -1,5 -1,5 +1,6 @@@
 +# SPDX-License-Identifier: GPL-2.0
  obj-y = base.o device.o platform.o property.o
+ obj-$(CONFIG_OF_KOBJ) += kobj.o
  obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
  obj-$(CONFIG_OF_FLATTREE) += fdt.o
  obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o

diff --cc drivers/of/base.c
Simple merge

diff --cc drivers/of/unittest.c
Simple merge

diff --cc include/linux/of.h
Simple merge

diff --cc scripts/Makefile.dtbinst
Simple merge

diff --cc scripts/Makefile.lib
Simple merge

diff --cc scripts/dtc/update-dtc-source.sh
Simple merge