mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 13:11:40 +00:00
4d3d3559fc
Cross-merge networking fixes after downstream PR. Conflicts: Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yamlc25504a0ba("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed property phys")be034ee6c3("dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties") https://lore.kernel.org/20240815110934.56ae623a@canb.auug.org.au drivers/net/dsa/vitesse-vsc73xx-core.c5b9eebc2c7("net: dsa: vsc73xx: pass value in phy_write operation")fa63c6434b("net: dsa: vsc73xx: check busy flag in MDIO operations")2524d6c28b("net: dsa: vsc73xx: use defined values in phy operations") https://lore.kernel.org/20240813104039.429b9fe6@canb.auug.org.au Resolve by using FIELD_PREP(), Stephen's resolution is simpler. Adjacent changes: net/vmw_vsock/af_vsock.c69139d2919("vsock: fix recursive ->recvmsg calls")744500d81f("vsock: add support for SIOCOUTQ ioctl") Link: https://patch.msgid.link/20240815141149.33862-1-pabeni@redhat.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
57 lines
1.1 KiB
YAML
57 lines
1.1 KiB
YAML
# 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
|
|
|
|
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
|
|
|
|
pcs-handle:
|
|
maxItems: 1
|
|
description:
|
|
A reference to a node representing a PCS PHY device found on
|
|
the internal MDIO bus.
|
|
|
|
phys:
|
|
description: A reference to the SerDes lane(s)
|
|
maxItems: 1
|
|
|
|
required:
|
|
- reg
|
|
|
|
unevaluatedProperties: 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>;
|
|
};
|
|
};
|