diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-17 02:08:28 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-17 02:08:28 +0300 |
commit | 62746f92b10a4add6a7db87ff59b901276746b11 (patch) | |
tree | 5c0197a06cea6418c49a9a3fbaf349a9d1508f8a /Documentation/devicetree/bindings/net/macb.txt | |
parent | f68e4041ef63f03091e44b4eebf1ab5c5d427e6f (diff) | |
parent | e33dc2f3636749c2f949a59c2ff8acd4a69c9c78 (diff) | |
download | linux-62746f92b10a4add6a7db87ff59b901276746b11.tar.xz |
Merge tag 'devicetree-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring:
- Add vendor prefixes for bm, gpio-key, mentor, FII, and Ampere
- Add ADP5585/ADP5589 and delta,q54sj108a2 to trivial-devices.yaml
- Convert fixed-partitions, i2c-gate and fsl,dpaa2-console bindings to
schemas
- Drop PicoXcell bindings
- Drop unused and undocumented 'pnx,timeout' property from LPC32xx
- Add 'dynamic-power-coefficient' to Mali GPU bindings
- Make 'make dt_binding_check' not error out on warnings
- Various minor binding fixes
* tag 'devicetree-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (22 commits)
dt-bindings: mali-bifrost: Add dynamic-power-coefficient
dt-bindings: mali-midgard: Add dynamic-power-coefficient
dt-bindings: i2c: dw: cancel mandatory requirements for "#address-cells" and "#size-cells"
dt-bindings: Remove PicoXcell bindings
ARM: dts: lpc32xx: Remove unused and undocumented 'pnx,timeout'
dt-bindings: mtd: convert "fixed-partitions" to the json-schema
dt-bindings: vendor-prefixes: Add undocumented bm, gpio-key, and mentor prefixes
dt-bindings: pci: rcar-pci-ep: Document missing interrupts property
dt-bindings: vendor-prefixes: Add an entry for AmpereComputing.com
dt-bindings: vendor-prefixes: correct the spelling of TQ-Systems GmbH
dt-bindings: mfd: fix stm32 timers example
dt-bindings: trivial-devices: Add delta,q54sj108a2
dt-bindings:i2c:i2c-gate: txt to yaml conversion
dt-bindings: add ADP5585/ADP5589 entries to trivial-devices
dt-bindings: Correct GV11B GPU register sizes
dt-bindings: vendor-prefixes: Add FII
dt-bindings: Fix typo on the DesignWare IP reset bindings documentation
dt-bindings: Fix error in 'make dtbs_check' when using DT_SCHEMA_FILES
dt-bindings: arm: vt8500: remove redundant white-spaces
dt-bindings: fsl-imx-drm: fix example compatible string
...
Diffstat (limited to 'Documentation/devicetree/bindings/net/macb.txt')
-rw-r--r-- | Documentation/devicetree/bindings/net/macb.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt index e08c5a9d53da..a4d547efc32a 100644 --- a/Documentation/devicetree/bindings/net/macb.txt +++ b/Documentation/devicetree/bindings/net/macb.txt @@ -7,8 +7,6 @@ Required properties: Use "cdns,sam9x60-macb" for Microchip sam9x60 SoC. Use "cdns,np4-macb" for NP4 SoC devices. Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb". - Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on - the Cadence GEM, or the generic form: "cdns,gem". Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs. Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs. Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs. |