From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2020 00:32:52 +0000 (-0700)
Subject: Merge tag 'devicetree-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bef7b2a7be28638770972ab2709adf11d601c11a;p=linux.git

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

Pull devicetree updates from Rob Herring:

 - Unit test for overlays with GPIO hogs

 - Improve dma-ranges parsing to handle dma-ranges with multiple entries

 - Update dtc to upstream version v1.6.0-2-g87a656ae5ff9

 - Improve overlay error reporting

 - Device link support for power-domains and hwlocks bindings

 - Add vendor prefixes for Beacon, Topwise, ENE, Dell, SG Micro, Elida,
   PocketBook, Xiaomi, Linutronix, OzzMaker, Waveshare Electronics, and
   ITE Tech

 - Add deprecated Marvell vendor prefix 'mrvl'

 - A bunch of binding conversions to DT schema continues. Of note, the
   common serial and USB connector bindings are converted.

 - Add more Arm CPU compatibles

 - Drop Mark Rutland as DT maintainer :(

* tag 'devicetree-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (106 commits)
  MAINTAINERS: drop an old reference to stm32 pwm timers doc
  MAINTAINERS: dt: update etnaviv file reference
  dt-bindings: usb: dwc2: fix bindings for amlogic, meson-gxbb-usb
  dt-bindings: uniphier-system-bus: fix warning in the example
  dt-bindings: display: meson-vpu: fix indentation of reg-names' "items"
  dt-bindings: iio: Fix adi, ltc2983 uint64-matrix schema constraints
  dt-bindings: power: Fix example for power-domain
  dt-bindings: arm: Add some constraints for PSCI nodes
  of: some unittest overlays not untracked
  of: gpio unittest kfree() wrong object
  dt-bindings: phy: convert phy-rockchip-inno-usb2 bindings to yaml
  dt-bindings: serial: sh-sci: Convert to json-schema
  dt-bindings: serial: Document serialN aliases
  dt-bindings: thermal: tsens: Set 'additionalProperties: false'
  dt-bindings: thermal: tsens: Fix nvmem-cell-names schema
  dt-bindings: vendor-prefixes: Add Beacon vendor prefix
  dt-bindings: vendor-prefixes: Add Topwise
  of: of_private.h: Replace zero-length array with flexible-array member
  docs: dt: fix a broken reference to input.yaml
  docs: dt: fix references to ap806-system-controller.txt
  ...
---

bef7b2a7be28638770972ab2709adf11d601c11a
diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
index 330cab25cc923,bcae5f9b1d7fb..4165352a590a1
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@@ -34,10 -34,14 +34,6 @@@ properties
            - adi,adt7461
              # +/-1C TDM Extended Temp Range I.C
            - adt7461
-             # Three-Axis Digital Accelerometer
-           - adi,adxl345
-             # Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too)
-           - adi,adxl346
 -            # +/-1C TDM Extended Temp Range I.C
 -          - adi,adt7473
 -            # +/-1C TDM Extended Temp Range I.C
 -          - adi,adt7475
 -            # +/-1C TDM Extended Temp Range I.C
 -          - adi,adt7476
 -            # +/-1C TDM Extended Temp Range I.C
 -          - adi,adt7490
              # AMS iAQ-Core VOC Sensor
            - ams,iaq-core
              # i2c serial eeprom  (24cxx)
diff --cc Documentation/devicetree/bindings/usb/generic.txt
index 67c51759a6422,474e74c06522d..ba472e7aefc9d
--- a/Documentation/devicetree/bindings/usb/generic.txt
+++ b/Documentation/devicetree/bindings/usb/generic.txt
@@@ -34,13 -34,7 +34,13 @@@ Optional properties
   - usb-role-switch: boolean, indicates that the device is capable of assigning
  			the USB data role (USB host or USB device) for a given
  			USB connector, such as Type-C, Type-B(micro).
- 			see connector/usb-connector.txt.
+ 			see connector/usb-connector.yaml.
 + - role-switch-default-mode: indicating if usb-role-switch is enabled, the
 +			device default operation mode of controller while usb
 +			role is USB_ROLE_NONE. Valid arguments are "host" and
 +			"peripheral". Defaults to "peripheral" if not
 +			specified.
 +
  
  This is an attribute to a USB controller such as:
  
diff --cc MAINTAINERS
index c3e43514f174b,85d3dd3b18f37..eeff555607597
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2291,9 -2274,8 +2291,9 @@@ L:	linux-arm-kernel@lists.infradead.or
  L:	linux-rockchip@lists.infradead.org
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:	Maintained
- F:	Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
+ F:	Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
  F:	Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
 +F:	Documentation/devicetree/bindings/spi/spi-rockchip.yaml
  F:	arch/arm/boot/dts/rk3*
  F:	arch/arm/boot/dts/rv1108*
  F:	arch/arm/mach-rockchip/