diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-03-07 18:22:33 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-03-07 18:22:33 +0000 |
| commit | 653b37e2c7055b9f778342341881788ad6e967a5 (patch) | |
| tree | ec05777bacbe8980471481b3b1b090d74427ff2f /Documentation/devicetree/bindings/net | |
| parent | c6036e92d242ca4457bef28f3e70751f50df1eeb (diff) | |
| parent | c4ca4659678e07f0a14b3b143f6fb746efe11f88 (diff) | |
Merge tag 'v5.4.103' into 5.4-2.3.x-imx
This is the 5.4.103 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'Documentation/devicetree/bindings/net')
| -rw-r--r-- | Documentation/devicetree/bindings/net/btusb.txt | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/ethernet-controller.yaml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/btusb.txt b/Documentation/devicetree/bindings/net/btusb.txt index b1ad6ee68e90..c51dd99dc0d3 100644 --- a/Documentation/devicetree/bindings/net/btusb.txt +++ b/Documentation/devicetree/bindings/net/btusb.txt @@ -38,7 +38,7 @@ Following example uses irq pin number 3 of gpio0 for out of band wake-on-bt: compatible = "usb1286,204e"; reg = <1>; interrupt-parent = <&gpio0>; - interrupt-name = "wakeup"; + interrupt-names = "wakeup"; interrupts = <3 IRQ_TYPE_LEVEL_LOW>; }; }; diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml index 0bac41cc7ba1..2aa3c58d2396 100644 --- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml @@ -204,6 +204,11 @@ properties: Indicates that full-duplex is used. When absent, half duplex is assumed. + pause: + $ref: /schemas/types.yaml#definitions/flag + description: + Indicates that pause should be enabled. + asym-pause: $ref: /schemas/types.yaml#definitions/flag description: |