diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-18 12:40:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-18 12:40:55 -0700 |
commit | d1a88690cea3872f83a1004b1a08a39879715fa1 (patch) | |
tree | 7ec7c09878d9ddf9916847df821a950345f3c58d /Documentation/devicetree/bindings/arm/tegra.yaml | |
parent | cd395d529faf46bd7fd799852a659ca1bd650a27 (diff) | |
parent | 55c21d57eafb7b379bb7b3e93baf9ca2695895b0 (diff) | |
download | linux-d1a88690cea3872f83a1004b1a08a39879715fa1.tar.bz2 |
Merge tag 'devicetree-fixes-for-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Revert fw_devlink tracking 'phy-handle' links. This broke at least a
few platforms. A better solution is being worked on.
- Add Samsung UFS binding which fell thru the cracks
- Doc reference fixes from Mauro
- Fix for restricted DMA error handling
* tag 'devicetree-fixes-for-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: arm: Fix Toradex compatible typo
of: restricted dma: Fix condition for rmem init
dt-bindings: arm: mediatek: mmsys: update mediatek,mmsys.yaml reference
dt-bindings: net: dsa: sja1105: update nxp,sja1105.yaml reference
dt-bindings: ufs: Add bindings for Samsung ufs host
Revert "of: property: fw_devlink: Add support for "phy-handle" property"
Diffstat (limited to 'Documentation/devicetree/bindings/arm/tegra.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/arm/tegra.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/tegra.yaml b/Documentation/devicetree/bindings/arm/tegra.yaml index b962fa6d649c..d79d36ac0c44 100644 --- a/Documentation/devicetree/bindings/arm/tegra.yaml +++ b/Documentation/devicetree/bindings/arm/tegra.yaml @@ -54,7 +54,7 @@ properties: - const: toradex,apalis_t30 - const: nvidia,tegra30 - items: - - const: toradex,apalis_t30-eval-v1.1 + - const: toradex,apalis_t30-v1.1-eval - const: toradex,apalis_t30-eval - const: toradex,apalis_t30-v1.1 - const: toradex,apalis_t30 |