diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-12-08 23:57:14 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-08 23:57:15 +0100 |
commit | 3eaac3aed2e3aff29198a6058069fa7712d13e60 (patch) | |
tree | bc98b3973831ebe063f61bd4699aa816b15344a0 /Documentation/devicetree/bindings/net | |
parent | 1e3e7ca547a6ee2c5c232535cb546919ce0fbea7 (diff) | |
parent | 747ec53ea72a548693d0664817776d3634e9b63a (diff) |
Merge tag 'imx-bindings-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX DT bindings update for 5.11:
- Quite some patches that update vendor-prefixes.yaml and fsl.yaml to
document missing board compatibles and add new board compatibles.
- A couple of patches from Dong Aisheng to update imx-scu firmware and
imx-lpcg clock bindings for new SCU two cells clock support.
- A couple of net bindings update from Ioana Ciornei to complete the
MAC/PCS/PHY representation on DPAA2 devices.
- Document watchdog compatibles for all i.MX and Layerscape devices.
* tag 'imx-bindings-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (35 commits)
dt-bindings: arm: fsl: add Protonic WD3 board
dt-bindings: vendor-prefixes: add "virtual" prefix
dt-bindings: fsl: add kamstrup flex concentrator to schema
dt-bindings: arm: fsl: document i.MX7S boards
dt-bindings: arm: fsl: document SolidRun LX2160A boards
dt-bindings: arm: fsl: document LS1012A FRWY board
dt-bindings: arm: fsl: add Van der Laan LANMCU board
dt-bindings: arm: fsl: add Altesco I6P board
dt-bindings: vendor-prefixes: Add an entry for Altus-Escon-Company
dt-bindings: net: add the 10gbase-r connection type
dt-bindings: net: add the DPAA2 MAC DTS definition
dt-bindings: fsl: add compatible for LX2162A QDS Board
dt-bindings: vendor-prefixes: Add an entry for Van der Laan b.v.
dt-bindings: arm: fsl: document i.MX7D boards
dt-bindings: arm: fsl: document i.MX6ULL boards
dt-bindings: arm: fsl: document i.MX6UL boards
dt-bindings: arm: fsl: document i.MX6SX boards
dt-bindings: arm: fsl: document i.MX6SL boards
dt-bindings: arm: fsl: document i.MX6QP boards
dt-bindings: arm: fsl: document i.MX6Q boards
...
Link: https://lore.kernel.org/r/20201202142717.9262-3-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/net')
-rw-r--r-- | Documentation/devicetree/bindings/net/ethernet-controller.yaml | 1 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml | 60 |
2 files changed, 61 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml index fdf709817218..cc93063a8f39 100644 --- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml @@ -95,6 +95,7 @@ properties: # 10GBASE-KR, XFI, SFI - 10gbase-kr - usxgmii + - 10gbase-r phy-mode: $ref: "#/properties/phy-connection-type" diff --git a/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml b/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml new file mode 100644 index 000000000000..2159b7d1f537 --- /dev/null +++ b/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/fsl,qoriq-mc-dpmac.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: DPAA2 MAC bindings + +maintainers: + - Ioana Ciornei <ioana.ciornei@nxp.com> + +description: + This binding represents the DPAA2 MAC objects found on the fsl-mc bus and + located under the 'dpmacs' node for the fsl-mc bus DTS node. + +allOf: + - $ref: "ethernet-controller.yaml#" + +properties: + compatible: + const: fsl,qoriq-mc-dpmac + + reg: + maxItems: 1 + description: The DPMAC number + + phy-handle: true + + phy-connection-type: true + + phy-mode: true + + pcs-handle: + $ref: /schemas/types.yaml#definitions/phandle + description: + A reference to a node representing a PCS PHY device found on + the internal MDIO bus. + + managed: true + +required: + - reg + +additionalProperties: false + +examples: + - | + dpmacs { + #address-cells = <1>; + #size-cells = <0>; + + ethernet@4 { + compatible = "fsl,qoriq-mc-dpmac"; + reg = <0x4>; + phy-handle = <&mdio1_phy6>; + phy-connection-type = "qsgmii"; + managed = "in-band-status"; + pcs-handle = <&pcs3_1>; + }; + }; |