diff options
| author | Joel Stanley <joel@jms.id.au> | 2021-12-22 04:05:54 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2021-12-22 04:05:59 +0300 |
| commit | dd1e40cecc7ca43ce22552e380bbc00b720575f5 (patch) | |
| tree | 0c5609f9fa84dfc5e87b8f4288ff4493967cd50d /Documentation/devicetree | |
| parent | d3226532acf4ee0c96a27073d951107aa2be27c4 (diff) | |
| parent | 57dcae4a8b93271c4e370920ea0dbb94a0215d30 (diff) | |
| download | linux-dd1e40cecc7ca43ce22552e380bbc00b720575f5.tar.xz | |
Merge tag 'v5.15.10' into dev-5.15
This is the 5.15.10 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml | 14 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/ethernet-phy.yaml | 8 |
2 files changed, 10 insertions, 12 deletions
diff --git a/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml b/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml index 877183cf4278..1ef849dc74d7 100644 --- a/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml +++ b/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml @@ -79,6 +79,8 @@ properties: properties: data-lanes: + description: + Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines. items: minItems: 1 maxItems: 4 @@ -91,18 +93,6 @@ properties: required: - data-lanes - allOf: - - if: - properties: - compatible: - contains: - const: fsl,imx7-mipi-csi2 - then: - properties: - data-lanes: - items: - maxItems: 2 - port@1: $ref: /schemas/graph.yaml#/properties/port description: diff --git a/Documentation/devicetree/bindings/net/ethernet-phy.yaml b/Documentation/devicetree/bindings/net/ethernet-phy.yaml index 2766fe45bb98..ee42328a109d 100644 --- a/Documentation/devicetree/bindings/net/ethernet-phy.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-phy.yaml @@ -91,6 +91,14 @@ properties: compensate for the board being designed with the lanes swapped. + enet-phy-lane-no-swap: + $ref: /schemas/types.yaml#/definitions/flag + description: + If set, indicates that PHY will disable swap of the + TX/RX lanes. This property allows the PHY to work correcly after + e.g. wrong bootstrap configuration caused by issues in PCB + layout design. + eee-broken-100tx: $ref: /schemas/types.yaml#/definitions/flag description: |