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

index 27dce08edd733b0a4c85cb2ac71baa90edb043b5,21e2d96295fee5290d2f92c4043b1693d49b7ce2..678039d4d5e57f96eacd9c9b5a0e8ce72a1d4dd4
@@@ -55,7 -55,6 +55,6 @@@ epson,rx8010          I2C-BUS INTERFACE REAL TI
  epson,rx8581          I2C-BUS INTERFACE REAL TIME CLOCK MODULE
  emmicro,em3027                EM Microelectronic EM3027 Real-time Clock
  fsl,mag3110           MAG3110: Xtrinsic High Accuracy, 3D Magnetometer
- fsl,mc13892           MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51
  fsl,mma7660           MMA7660FC: 3-Axis Orientation/Motion Detection Sensor
  fsl,mma8450           MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer
  fsl,mpl3115           MPL3115: Absolute Digital Pressure Sensor
@@@ -71,7 -70,6 +70,7 @@@ isil,isl29028         Intersil ISL29028 Ambien
  isil,isl29030         Intersil ISL29030 Ambient Light and Proximity Sensor
  maxim,ds1050          5 Bit Programmable, Pulse-Width Modulator
  maxim,max1237         Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
 +maxim,max6621         PECI-to-I2C translator for PECI-to-SMBus/I2C protocol conversion
  maxim,max6625         9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
  mc,rv3029c2           Real Time Clock Module with I2C-Bus
  mcube,mc3230          mCube 3-axis 8-bit digital accelerometer
diff --combined drivers/of/base.c
index f2e649ff746f546b153d5ff1f64dc70958490c56,e6818a935b96a998efb8efddf76f16f547b7264a..26618ba8f92a55e8d42db822b507bb8e8827e49f
@@@ -761,10 -761,10 +761,10 @@@ EXPORT_SYMBOL(of_find_node_opts_by_path
  
  /**
   *    of_find_node_by_name - Find a node by its "name" property
-  *    @from:  The node to start searching from or NULL, the node
+  *    @from:  The node to start searching from or NULL; the node
   *            you pass will not be searched, only the next one
-  *            will; typically, you pass what the previous call
-  *            returned. of_node_put() will be called on it
+  *            will. Typically, you pass what the previous call
+  *            returned. of_node_put() will be called on @from.
   *    @name:  The name string to match against
   *
   *    Returns a node pointer with refcount incremented, use
@@@ -1648,12 -1648,8 +1648,12 @@@ bool of_console_check(struct device_nod
  {
        if (!dn || dn != of_stdout || console_set_on_cmdline)
                return false;
 -      return !add_preferred_console(name, index,
 -                                    kstrdup(of_stdout_options, GFP_KERNEL));
 +
 +      /*
 +       * XXX: cast `options' to char pointer to suppress complication
 +       * warnings: printk, UART and console drivers expect char pointer.
 +       */
 +      return !add_preferred_console(name, index, (char *)of_stdout_options);
  }
  EXPORT_SYMBOL_GPL(of_console_check);
  
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 {
  #include "tests-match.dtsi"
  #include "tests-platform.dtsi"
  #include "tests-overlay.dtsi"
- /*
-  * phandle fixup data - generated by dtc patches that aren't upstream.
-  * This data must be regenerated whenever phandle references are modified in
-  * the testdata tree.
-  *
-  * The format of this data may be subject to change. For the time being consider
-  * this a kernel-internal data format.
-  */
- / { __local_fixups__ {
-       testcase-data {
-               phandle-tests {
-                       consumer-a {
-                               phandle-list = <0x00000000 0x00000008
-                                               0x00000018 0x00000028
-                                               0x00000034 0x00000038>;
-                               phandle-list-bad-args = <0x00000000 0x0000000c>;
-                       };
-               };
-               interrupts {
-                       intmap0 {
-                               interrupt-map = <0x00000004 0x00000010
-                                                0x00000024 0x00000034>;
-                       };
-                       intmap1 {
-                               interrupt-map = <0x0000000c>;
-                       };
-                       interrupts0 {
-                               interrupt-parent = <0x00000000>;
-                       };
-                       interrupts1 {
-                               interrupt-parent = <0x00000000>;
-                       };
-                       interrupts-extended0 {
-                               interrupts-extended = <0x00000000 0x00000008
-                                                      0x00000018 0x00000024
-                                                      0x0000002c 0x00000034
-                                                      0x0000003c>;
-                       };
-               };
-               testcase-device1 {
-                       interrupt-parent = <0x00000000>;
-               };
-               testcase-device2 {
-                       interrupt-parent = <0x00000000>;
-               };
-               overlay2 {
-                       fragment@0 {
-                               target = <0x00000000>;
-                       };
-               };
-               overlay3 {
-                       fragment@0 {
-                               target = <0x00000000>;
-                       };
-               };
-               overlay4 {
-                       fragment@0 {
-                               target = <0x00000000>;
-                       };
-               };
-       };
- }; };