summaryrefslogtreecommitdiff
path: root/Documentation/devicetree
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>2021-04-14 10:08:08 +0000
committerAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>2021-04-14 10:08:08 +0000
commit8ad3d2ca53512dbb09a96c97d59595dea182e45a (patch)
tree26bfb9084d0f64e69c8f513fdf011cd4d2175329 /Documentation/devicetree
parent25c1032ec1d776ed2f023d802ba269f5f1a0c12d (diff)
parent8f55ad4daf001b6ee8ddf672e14475a35403b258 (diff)
Merge tag 'v5.4.112' into 5.4-2.3.x-imx
This is the 5.4.112 stable release Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r--Documentation/devicetree/bindings/net/ethernet-controller.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
index 2aa3c58d2396..b986a395a6af 100644
--- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
@@ -60,7 +60,7 @@ properties:
description:
Reference to an nvmem node for the MAC address
- nvmem-cells-names:
+ nvmem-cell-names:
const: mac-address
nvmem_macaddr_swap: