From: Stefan Wahren <[email protected]>
This converts the VCHIQ bindings to YAML format.
Signed-off-by: Stefan Wahren <[email protected]>
Co-developed-by: Nicolas Saenz Julienne <[email protected]>
Signed-off-by: Nicolas Saenz Julienne <[email protected]>
---
Changes since v2:
- Reinstate fallback compatible
.../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 17 ------
.../bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 53 +++++++++++++++++++
2 files changed, 53 insertions(+), 17 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
deleted file mode 100644
index f331316183f6..000000000000
--- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Broadcom VCHIQ firmware services
-
-Required properties:
-
-- compatible: Should be "brcm,bcm2835-vchiq" on BCM2835, otherwise
- "brcm,bcm2836-vchiq".
-- reg: Physical base address and length of the doorbell register pair
-- interrupts: The interrupt number
- See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
-
-Example:
-
-mailbox@7e00b840 {
- compatible = "brcm,bcm2835-vchiq";
- reg = <0x7e00b840 0xf>;
- interrupts = <0 2>;
-};
diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
new file mode 100644
index 000000000000..e04439b3355b
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/soc/bcm/brcm,bcm2835-vchiq.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom VCHIQ firmware services
+
+maintainers:
+ - Nicolas Saenz Julienne <[email protected]>
+
+description:
+ The VCHIQ communication channel can be provided by BCM283x and Capri SoCs,
+ to communicate with the VPU-side OS services.
+
+properties:
+ compatible:
+ oneOf:
+ - description: BCM2835 based boards
+ items:
+ - enum:
+ - brcm,bcm2835-vchiq
+
+ - description: BCM2836/BCM2837 based boards
+ items:
+ - enum:
+ - brcm,bcm2836-vchiq
+ - const: brcm,bcm2835-vchiq
+
+ reg:
+ description: Physical base address and length of the doorbell register pair
+ minItems: 1
+
+ interrupts:
+ description: Interrupt number of the doorbell interrupt
+ minItems: 1
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ mailbox@7e00b840 {
+ compatible = "brcm,bcm2835-vchiq";
+ reg = <0x7e00b840 0xf>;
+ interrupts = <0 2>;
+ };
+
+...
--
2.33.1
On Wed, Dec 15, 2021 at 10:44:49AM +0100, Nicolas Saenz Julienne wrote:
> From: Stefan Wahren <[email protected]>
>
> This converts the VCHIQ bindings to YAML format.
Am I supposed to review this? Some version of it is already in
linux-next...
>
> Signed-off-by: Stefan Wahren <[email protected]>
> Co-developed-by: Nicolas Saenz Julienne <[email protected]>
> Signed-off-by: Nicolas Saenz Julienne <[email protected]>
>
> ---
> Changes since v2:
> - Reinstate fallback compatible
>
> .../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 17 ------
> .../bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 53 +++++++++++++++++++
> 2 files changed, 53 insertions(+), 17 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
> create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
>
> diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
> deleted file mode 100644
> index f331316183f6..000000000000
> --- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -Broadcom VCHIQ firmware services
> -
> -Required properties:
> -
> -- compatible: Should be "brcm,bcm2835-vchiq" on BCM2835, otherwise
> - "brcm,bcm2836-vchiq".
> -- reg: Physical base address and length of the doorbell register pair
> -- interrupts: The interrupt number
> - See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
> -
> -Example:
> -
> -mailbox@7e00b840 {
> - compatible = "brcm,bcm2835-vchiq";
> - reg = <0x7e00b840 0xf>;
> - interrupts = <0 2>;
> -};
> diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
> new file mode 100644
> index 000000000000..e04439b3355b
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
> @@ -0,0 +1,53 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/soc/bcm/brcm,bcm2835-vchiq.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Broadcom VCHIQ firmware services
> +
> +maintainers:
> + - Nicolas Saenz Julienne <[email protected]>
> +
> +description:
> + The VCHIQ communication channel can be provided by BCM283x and Capri SoCs,
> + to communicate with the VPU-side OS services.
> +
> +properties:
> + compatible:
> + oneOf:
> + - description: BCM2835 based boards
> + items:
> + - enum:
> + - brcm,bcm2835-vchiq
> +
> + - description: BCM2836/BCM2837 based boards
> + items:
> + - enum:
> + - brcm,bcm2836-vchiq
> + - const: brcm,bcm2835-vchiq
> +
> + reg:
> + description: Physical base address and length of the doorbell register pair
> + minItems: 1
> +
> + interrupts:
> + description: Interrupt number of the doorbell interrupt
> + minItems: 1
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + mailbox@7e00b840 {
> + compatible = "brcm,bcm2835-vchiq";
> + reg = <0x7e00b840 0xf>;
> + interrupts = <0 2>;
> + };
> +
> +...
> --
> 2.33.1
>
>
Hi Rob,
On Wed, 2021-12-15 at 09:48 -0600, Rob Herring wrote:
> On Wed, Dec 15, 2021 at 10:44:49AM +0100, Nicolas Saenz Julienne wrote:
> > From: Stefan Wahren <[email protected]>
> >
> > This converts the VCHIQ bindings to YAML format.
>
> Am I supposed to review this? Some version of it is already in
> linux-next...
It's been removed from linux-next for the time being. There was some issues
with the previous binding, namely the fact that it removed the fallback to
'bcrm,bcm2835-vchiq' on BCM2836/BCM2837. All in all, having it is harmless and
might avoid regressions on some OSs.
Regards,
Nicolas
On Wed, Dec 15, 2021 at 10:44:49AM +0100, Nicolas Saenz Julienne wrote:
> From: Stefan Wahren <[email protected]>
>
> This converts the VCHIQ bindings to YAML format.
>
> Signed-off-by: Stefan Wahren <[email protected]>
> Co-developed-by: Nicolas Saenz Julienne <[email protected]>
> Signed-off-by: Nicolas Saenz Julienne <[email protected]>
>
> ---
> Changes since v2:
> - Reinstate fallback compatible
>
> .../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 17 ------
> .../bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 53 +++++++++++++++++++
> 2 files changed, 53 insertions(+), 17 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
> create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
>
> diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
> deleted file mode 100644
> index f331316183f6..000000000000
> --- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -Broadcom VCHIQ firmware services
> -
> -Required properties:
> -
> -- compatible: Should be "brcm,bcm2835-vchiq" on BCM2835, otherwise
> - "brcm,bcm2836-vchiq".
> -- reg: Physical base address and length of the doorbell register pair
> -- interrupts: The interrupt number
> - See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
> -
> -Example:
> -
> -mailbox@7e00b840 {
> - compatible = "brcm,bcm2835-vchiq";
> - reg = <0x7e00b840 0xf>;
> - interrupts = <0 2>;
> -};
> diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
> new file mode 100644
> index 000000000000..e04439b3355b
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
> @@ -0,0 +1,53 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/soc/bcm/brcm,bcm2835-vchiq.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Broadcom VCHIQ firmware services
> +
> +maintainers:
> + - Nicolas Saenz Julienne <[email protected]>
> +
> +description:
> + The VCHIQ communication channel can be provided by BCM283x and Capri SoCs,
> + to communicate with the VPU-side OS services.
> +
> +properties:
> + compatible:
> + oneOf:
> + - description: BCM2835 based boards
> + items:
> + - enum:
> + - brcm,bcm2835-vchiq
> +
> + - description: BCM2836/BCM2837 based boards
> + items:
> + - enum:
> + - brcm,bcm2836-vchiq
> + - const: brcm,bcm2835-vchiq
> +
> + reg:
> + description: Physical base address and length of the doorbell register pair
> + minItems: 1
> +
> + interrupts:
> + description: Interrupt number of the doorbell interrupt
> + minItems: 1
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + mailbox@7e00b840 {
A 'mailbox' node should have '#mbox-cells'. And be located in
bindings/mailbox. That can all be a separate patch (or part of this one
if you want).
Reviewed-by: Rob Herring <[email protected]>
> + compatible = "brcm,bcm2835-vchiq";
> + reg = <0x7e00b840 0xf>;
> + interrupts = <0 2>;
> + };
> +
> +...
> --
> 2.33.1
>
>