]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'devicetree-fixes-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Nov 2017 07:38:41 +0000 (21:38 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Nov 2017 07:38:41 +0000 (21:38 -1000)
Pull DeviceTree fixes from Rob Herring:

 - Remove mc13892 as a trivial device

 - Improve of_find_node_by_name() documentation

 - Fix unit test dtc warnings

 - Clean-ups of USB binding documentation

 - Fix potential NULL deref in of_pci_map_rid

* tag 'devicetree-fixes-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: trivial-devices: Remove fsl,mc13892
  of: Document exactly what of_find_node_by_name() puts
  of: unittest: disable interrupts_property warning
  of: unittest: let dtc generate __local_fixups__
  dt-bindings: usb: document hub and host-controller properties
  dt-bindings: usb: clean up compatible property
  dt-bindings: usb: fix reg-property port-number range
  dt-bindings: usb: fix example hub node name
  of/pci: Fix theoretical NULL dereference

1  2 
Documentation/devicetree/bindings/trivial-devices.txt
drivers/of/base.c
drivers/of/unittest-data/Makefile
drivers/of/unittest-data/testcases.dts

Simple merge
index 3031fc2f18f6fd6b8bb5ae8bd17b9c72ed733b4f,84b3bc44c0b474dcf1b7ffb689d97f74275614cf..32389acfa6164eb69dcd014f18ce12e58cb90050
@@@ -1,4 -1,4 +1,5 @@@
 +# SPDX-License-Identifier: GPL-2.0
+ DTC_FLAGS_testcases := -Wno-interrupts_property
  obj-y += testcases.dtb.o
  
  targets += testcases.dtb testcases.dtb.S
index ce49463d9d32b69bd6374ac3ebecdfe08c75b020,50b4d0d35aa0f802199d087e6a5f114257ae1055..55fe0ee20109fd68e7bc663f8f00f78618a5abd6
@@@ -1,5 -1,6 +1,7 @@@
 +// SPDX-License-Identifier: GPL-2.0
  /dts-v1/;
+ /plugin/;
  / {
        testcase-data {
                changeset {