diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-19 02:19:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-19 02:19:36 +0300 |
| commit | 05df204549c510c7c56e58d25098c448998a0cd5 (patch) | |
| tree | 2864b1a840abbcdcbd6720c6a19166029a8921ce /Documentation/devicetree/bindings/net/fsl-fman.txt | |
| parent | 04a1320651757c78277bea48bec97f0d43e6b17b (diff) | |
| parent | b9952b5218added5577e4a3443969bc20884cea9 (diff) | |
| download | linux-05df204549c510c7c56e58d25098c448998a0cd5.tar.xz | |
Merge tag 'devicetree-fixes-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring:
- Fix phandle cache to work with overlays
- Correct the default clock-frequency for QCom geni-i2c
- Binding doc quote and spelling fixes
* tag 'devicetree-fixes-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of: overlay: update phandle cache on overlay apply and remove
dt-bindings: Fix unbalanced quotation marks
dt-bindings: soc: qcom: Fix default clock-freq for qcom,geni-i2c
dt-bindings: w1-gpio: Remove unneeded unit address
Documentation: devicetree: tilcdc: fix spelling mistake "suppors" -> "supports"
Diffstat (limited to 'Documentation/devicetree/bindings/net/fsl-fman.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/net/fsl-fman.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/fsl-fman.txt b/Documentation/devicetree/bindings/net/fsl-fman.txt index df873d1f3b7c..f8c33890bc29 100644 --- a/Documentation/devicetree/bindings/net/fsl-fman.txt +++ b/Documentation/devicetree/bindings/net/fsl-fman.txt @@ -238,7 +238,7 @@ PROPERTIES Must include one of the following: - "fsl,fman-dtsec" for dTSEC MAC - "fsl,fman-xgec" for XGEC MAC - - "fsl,fman-memac for mEMAC MAC + - "fsl,fman-memac" for mEMAC MAC - cell-index Usage: required |