Skip to content

Commit c533072

Browse files
Rafał Miłeckigregkh
authored andcommitted
dt-bindings: nvmem: move deprecated cells binding to its own file
Support for old NVMEM fixed cells was deprecated in favour of "fixed-layout". It's still part of the nvmem.yaml though and may be unknowingly used by new bindings added without much of analyze. To make it more difficult to accidentally support old syntax move its binding to separated file with "deprecated" in its name. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Rob Herring <robh@kernel.org> Acked-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20231020105545.216052-4-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2cc3b37 commit c533072

19 files changed

+50
-10
lines changed

Documentation/devicetree/bindings/mtd/mtd.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ patternProperties:
4343
deprecated: true
4444

4545
"^otp(-[0-9]+)?$":
46-
$ref: ../nvmem/nvmem.yaml#
46+
type: object
47+
48+
allOf:
49+
- $ref: ../nvmem/nvmem.yaml#
50+
- $ref: ../nvmem/nvmem-deprecated-cells.yaml#
51+
4752
unevaluatedProperties: false
4853

4954
description: |

Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ maintainers:
1919
allOf:
2020
- $ref: /schemas/mtd/partitions/partition.yaml#
2121
- $ref: /schemas/nvmem/nvmem.yaml#
22+
- $ref: /schemas/nvmem/nvmem-deprecated-cells.yaml#
2223

2324
properties:
2425
compatible:

Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ maintainers:
1111

1212
allOf:
1313
- $ref: nvmem.yaml#
14+
- $ref: nvmem-deprecated-cells.yaml#
1415

1516
properties:
1617
compatible:

Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ maintainers:
1212

1313
allOf:
1414
- $ref: nvmem.yaml#
15+
- $ref: nvmem-deprecated-cells.yaml#
1516

1617
properties:
1718
compatible:

Documentation/devicetree/bindings/nvmem/apple,efuses.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ maintainers:
1616

1717
allOf:
1818
- $ref: nvmem.yaml#
19+
- $ref: nvmem-deprecated-cells.yaml#
1920

2021
properties:
2122
compatible:

Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description: |
1616
1717
allOf:
1818
- $ref: nvmem.yaml#
19+
- $ref: nvmem-deprecated-cells.yaml#
1920

2021
properties:
2122
compatible:

Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ maintainers:
1616

1717
allOf:
1818
- $ref: nvmem.yaml#
19+
- $ref: nvmem-deprecated-cells.yaml#
1920

2021
properties:
2122
$nodename:

Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description: |
1616
1717
allOf:
1818
- $ref: nvmem.yaml#
19+
- $ref: nvmem-deprecated-cells.yaml#
1920

2021
properties:
2122
compatible:

Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ maintainers:
1111

1212
allOf:
1313
- $ref: nvmem.yaml#
14+
- $ref: nvmem-deprecated-cells.yaml#
1415

1516
properties:
1617
compatible:
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/nvmem/nvmem-deprecated-cells.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NVMEM old syntax for fixed cells
8+
9+
maintainers:
10+
- Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
11+
12+
description: |
13+
Before introducing NVMEM layouts all NVMEM (fixed) cells were defined
14+
as direct device subnodes. That syntax was replaced by "fixed-layout"
15+
and is deprecated now. No new bindings should use it.
16+
17+
patternProperties:
18+
"@[0-9a-f]+(,[0-7])?$":
19+
type: object
20+
allOf:
21+
- $ref: layouts/fixed-cell.yaml
22+
- properties:
23+
compatible: false
24+
deprecated: true
25+
26+
additionalProperties: true
27+
28+
...

0 commit comments

Comments
 (0)