From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Jul 2017 17:37:54 +0000 (-0700)
Subject: Merge tag 'devicetree-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.13-rc1~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd6ec12f3bf83ca3c4e712a9f35960aec779f6f9;p=thirdparty%2Fkernel%2Flinux.git

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

Pull DeviceTree updates from Rob Herring:

 - vsprintf format specifier %pOF for device_node's. This will enable us
   to stop storing the full node names. Conversion of users will happen
   next cycle.

 - Update documentation to point to DT specification instead of ePAPR.

 - Split out graph and property functions to a separate file.

 - New of-graph functions for ALSA

 - Add vendor prefixes for RISC-V, Linksys, iWave Systems, Roofull,
   Itead, and BananaPi.

 - Improve dtx_diff utility filename printing.

* tag 'devicetree-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (32 commits)
  of: document /sys/firmware/fdt
  dt-bindings: Add RISC-V vendor prefix
  vsprintf: Add %p extension "%pOF" for device tree
  of: find_node_by_full_name rewrite to compare each level
  of: use kbasename instead of open coding
  dt-bindings: thermal: add file extension to brcm,ns-thermal
  of: update ePAPR references to point to Devicetree Specification
  scripts/dtc: dtx_diff - Show real file names in diff header
  of: detect invalid phandle in overlay
  of: be consistent in form of file mode
  of: make __of_attach_node() static
  of: address.c header comment typo
  of: fdt.c header comment typo
  of: make of_fdt_is_compatible() static
  dt-bindings: display-timing.txt convert non-ascii characters to ascii
  Documentation: remove overlay-notes reference to non-existent file
  dt-bindings: usb: exynos-usb: Add missing required VDD properties
  dt-bindings: Add vendor prefix for Linksys
  MAINTAINERS: add device tree ABI documentation file
  of: Add vendor prefix for iWave Systems Technologies Pvt. Ltd
  ...
---

dd6ec12f3bf83ca3c4e712a9f35960aec779f6f9
diff --cc Documentation/devicetree/bindings/net/ethernet.txt
index edd7fd2bbbf93,08dd263beeb90..7da86f22a13b8
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@@ -8,10 -8,10 +8,11 @@@ The following properties are common to 
    property;
  - max-speed: number, specifies maximum speed in Mbit/s supported by the device;
  - max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
-   the maximum frame size (there's contradiction in ePAPR).
+   the maximum frame size (there's contradiction in the Devicetree
+   Specification).
  - phy-mode: string, operation mode of the PHY interface. This is now a de-facto
    standard property; supported values are:
 +  * "internal"
    * "mii"
    * "gmii"
    * "sgmii"
@@@ -33,11 -33,11 +34,13 @@@
    * "2000base-x",
    * "2500base-x",
    * "rxaui"
 +  * "xaui"
 +  * "10gbase-kr" (10GBASE-KR, XFI, SFI)
- - phy-connection-type: the same as "phy-mode" property but described in ePAPR;
+ - phy-connection-type: the same as "phy-mode" property but described in the
+   Devicetree Specification;
  - phy-handle: phandle, specifies a reference to a node representing a PHY
-   device; this property is described in ePAPR and so preferred;
+   device; this property is described in the Devicetree Specification and so
+   preferred;
  - phy: the same as "phy-handle" property, not recommended for new bindings.
  - phy-device: the same as "phy-handle" property, not recommended for new
    bindings.
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 286f4e1e111fc,de66b61adcb74..708ff2504260c
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -174,9 -175,9 +177,10 @@@ lantiq	Lantiq Semiconducto
  lego	LEGO Systems A/S
  lenovo	Lenovo Group Ltd.
  lg	LG Corporation
 +libretech	Shenzhen Libre Technology Co., Ltd
  licheepi	Lichee Pi
  linaro	Linaro Limited
+ linksys	Belkin International, Inc. (Linksys)
  linux	Linux-specific binding
  lltc	Linear Technology Corporation
  lsi	LSI Corp. (LSI Logic)