From: Linus Torvalds Date: Wed, 15 Nov 2017 02:25:40 +0000 (-0800) Subject: Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~10019 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37cb8e1f8e10c6e9bd2a1b95cdda0620a21b0551;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'devicetree-for-4.15' of git://git./linux/kernel/git/robh/linux 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 ... --- 37cb8e1f8e10c6e9bd2a1b95cdda0620a21b0551 diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt index 9f4c3df,b2c1b8d..0f295a4 --- a/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 arch/arm64/boot/dts/Makefile index c6684ab,a7ecb42..d7c22d5 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@@ -1,34 -1,25 +1,26 @@@ +# SPDX-License-Identifier: GPL-2.0 - 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) + 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/apm/Makefile index a10fbdb,b96cd38..55b5cdc --- a/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/broadcom/Makefile index 3df2db7,da268c6..2a2591e --- a/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 04bb302,ea5516b..c4d06cf --- a/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 9f68c277,f7c0ca8..c178f7e --- a/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/lg/Makefile index e345b8e,de5dc19..4c3959e --- a/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/sprd/Makefile index d7188be,38cefdb..2bdc238 --- a/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/mips/boot/dts/Makefile index e0a4e93,bc4ce85..e2c6f13 --- a/arch/mips/boot/dts/Makefile +++ b/arch/mips/boot/dts/Makefile @@@ -1,22 -1,14 +1,15 @@@ +# SPDX-License-Identifier: GPL-2.0 - 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 + 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 drivers/of/Makefile index 8f19d34,83d61a7..63a4be6 --- a/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