.../bindings/mfd/atmel,at91sam9260-matrix.yaml | 52 ++++++++++++++++++++++ .../devicetree/bindings/mfd/atmel-matrix.txt | 26 ----------- 2 files changed, 52 insertions(+), 26 deletions(-)
Convert old text based binding to json schema.
Changes during conversion:
Add a missing fallback `atmel,at91sam9x5-matrix` for
`microchip,sam9x60-matrix` which is not defined in the text binding.
Signed-off-by: Charan Pedumuru <charan.pedumuru@microchip.com>
---
Changes in v2:
- Modified the commit messsage.
- Replaced `anyOf` with `oneOf` in compatible under properties.
- Removed additional items group and added both `microchip,sam9x60-matrix` and
`microchip,sam9x7-matrix` as an enum under one items group
- Replaced `matrix@` with `syscon@` in examples.
- Link to v1: https://lore.kernel.org/r/20241211-matrix-v1-1-5ef0104a3af4@microchip.com
---
.../bindings/mfd/atmel,at91sam9260-matrix.yaml | 52 ++++++++++++++++++++++
.../devicetree/bindings/mfd/atmel-matrix.txt | 26 -----------
2 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/atmel,at91sam9260-matrix.yaml b/Documentation/devicetree/bindings/mfd/atmel,at91sam9260-matrix.yaml
new file mode 100644
index 000000000000..447b3a3edbfc
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/atmel,at91sam9260-matrix.yaml
@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mfd/atmel,at91sam9260-matrix.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Microchip AT91 Bus Matrix
+
+maintainers:
+ - Nicolas Ferre <nicolas.ferre@microchip.com>
+
+description:
+ The Bus Matrix (MATRIX) implements a multi-layer AHB, based on the
+ AHB-Lite protocol, that enables parallel access paths between multiple
+ masters and slaves in a system, thus increasing the overall bandwidth.
+
+properties:
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - atmel,at91sam9260-matrix
+ - atmel,at91sam9261-matrix
+ - atmel,at91sam9263-matrix
+ - atmel,at91sam9rl-matrix
+ - atmel,at91sam9g45-matrix
+ - atmel,at91sam9n12-matrix
+ - atmel,at91sam9x5-matrix
+ - atmel,sama5d3-matrix
+ - const: syscon
+ - items:
+ - enum:
+ - microchip,sam9x60-matrix
+ - microchip,sam9x7-matrix
+ - const: atmel,at91sam9x5-matrix
+ - const: syscon
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+
+additionalProperties: false
+
+examples:
+ - |
+ syscon@ffffec00 {
+ compatible = "atmel,sama5d3-matrix", "syscon";
+ reg = <0xffffec00 0x200>;
+ };
diff --git a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt
deleted file mode 100644
index 6e5f83614e83..000000000000
--- a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-* Device tree bindings for Atmel Bus Matrix
-
-The Bus Matrix registers are used to configure Atmel SoCs internal bus
-behavior (master/slave priorities, undefined burst length type, ...)
-
-Required properties:
-- compatible: Should be one of the following
- "atmel,at91sam9260-matrix", "syscon"
- "atmel,at91sam9261-matrix", "syscon"
- "atmel,at91sam9263-matrix", "syscon"
- "atmel,at91sam9rl-matrix", "syscon"
- "atmel,at91sam9g45-matrix", "syscon"
- "atmel,at91sam9n12-matrix", "syscon"
- "atmel,at91sam9x5-matrix", "syscon"
- "atmel,sama5d3-matrix", "syscon"
- "microchip,sam9x60-matrix", "syscon"
- "microchip,sam9x7-matrix", "atmel,at91sam9x5-matrix", "syscon"
-- reg: Contains offset/length value of the Bus Matrix
- memory region.
-
-Example:
-
-matrix: matrix@ffffec00 {
- compatible = "atmel,sama5d3-matrix", "syscon";
- reg = <0xffffec00 0x200>;
-};
---
base-commit: 1b2ab8149928c1cea2d7eca30cd35bb7fe014053
change-id: 20241210-matrix-30021676fb6f
Best regards,
--
Charan Pedumuru <charan.pedumuru@microchip.com>On Wed, 18 Dec 2024 09:24:54 +0530, Charan Pedumuru wrote:
> Convert old text based binding to json schema.
> Changes during conversion:
> Add a missing fallback `atmel,at91sam9x5-matrix` for
> `microchip,sam9x60-matrix` which is not defined in the text binding.
>
>
Applied, thanks!
[1/1] dt-bindings: mfd: atmel,at91sam9260: Convert to json schema
commit: e3f17f8b55e76ed06a092cb8d187d3dba5102ffa
--
Lee Jones [李琼斯]
On Wed, Dec 18, 2024 at 09:24:54AM +0530, Charan Pedumuru wrote: > Convert old text based binding to json schema. > Changes during conversion: > Add a missing fallback `atmel,at91sam9x5-matrix` for > `microchip,sam9x60-matrix` which is not defined in the text binding. > > Signed-off-by: Charan Pedumuru <charan.pedumuru@microchip.com> > --- > Changes in v2: > - Modified the commit messsage. > - Replaced `anyOf` with `oneOf` in compatible under properties. > - Removed additional items group and added both `microchip,sam9x60-matrix` and > `microchip,sam9x7-matrix` as an enum under one items group > - Replaced `matrix@` with `syscon@` in examples. > - Link to v1: https://lore.kernel.org/r/20241211-matrix-v1-1-5ef0104a3af4@microchip.com > --- > .../bindings/mfd/atmel,at91sam9260-matrix.yaml | 52 ++++++++++++++++++++++ > .../devicetree/bindings/mfd/atmel-matrix.txt | 26 ----------- > 2 files changed, 52 insertions(+), 26 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mfd/atmel,at91sam9260-matrix.yaml b/Documentation/devicetree/bindings/mfd/atmel,at91sam9260-matrix.yaml > new file mode 100644 > index 000000000000..447b3a3edbfc > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/atmel,at91sam9260-matrix.yaml > @@ -0,0 +1,52 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mfd/atmel,at91sam9260-matrix.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Microchip AT91 Bus Matrix > + > +maintainers: > + - Nicolas Ferre <nicolas.ferre@microchip.com> > + > +description: > + The Bus Matrix (MATRIX) implements a multi-layer AHB, based on the > + AHB-Lite protocol, that enables parallel access paths between multiple > + masters and slaves in a system, thus increasing the overall bandwidth. > + > +properties: > + compatible: > + oneOf: > + - items: > + - enum: > + - atmel,at91sam9260-matrix > + - atmel,at91sam9261-matrix > + - atmel,at91sam9263-matrix > + - atmel,at91sam9rl-matrix > + - atmel,at91sam9g45-matrix > + - atmel,at91sam9n12-matrix FYI, the sort order is alphanumeric, which means your 9rl should be after g45 and n12. Not worth resending IMO. Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Cheers. Conor.
© 2016 - 2025 Red Hat, Inc.