On Mon, Apr 27, 2020 at 11:28:08AM +0100, Charles Keepax wrote:
> Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>
> ---
> .../devicetree/bindings/sound/cirrus,lochnagar.txt | 39 ---------------
> .../bindings/sound/cirrus,lochnagar.yaml | 58 ++++++++++++++++++++++
> 2 files changed, 58 insertions(+), 39 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
> create mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.yaml
>
> diff --git a/Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt b/Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
> deleted file mode 100644
> index 41ae2699f07a9..0000000000000
> --- a/Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -Cirrus Logic Lochnagar Audio Development Board
> -
> -Lochnagar is an evaluation and development board for Cirrus Logic
> -Smart CODEC and Amp devices. It allows the connection of most Cirrus
> -Logic devices on mini-cards, as well as allowing connection of
> -various application processor systems to provide a full evaluation
> -platform. Audio system topology, clocking and power can all be
> -controlled through the Lochnagar, allowing the device under test
> -to be used in a variety of possible use cases.
> -
> -This binding document describes the binding for the audio portion
> -of the driver.
> -
> -This binding must be part of the Lochnagar MFD binding:
> - [4] ../mfd/cirrus,lochnagar.txt
> -
> -Required properties:
> -
> - - compatible : One of the following strings:
> - "cirrus,lochnagar2-soundcard"
> -
> - - #sound-dai-cells : Must be set to 1.
> -
> - - clocks : Contains an entry for each entry in clock-names.
> - - clock-names : Must include the following clocks:
> - "mclk" Master clock source for the sound card, should normally
> - be set to LOCHNAGAR_SOUNDCARD_MCLK provided by the Lochnagar
> - clock driver.
> -
> -Example:
> -
> -lochnagar-sc {
> - compatible = "cirrus,lochnagar2-soundcard";
> -
> - #sound-dai-cells = <1>;
> -
> - clocks = <&lochnagar_clk LOCHNAGAR_SOUNDCARD_MCLK>;
> - clock-names = "mclk";
> -};
> diff --git a/Documentation/devicetree/bindings/sound/cirrus,lochnagar.yaml b/Documentation/devicetree/bindings/sound/cirrus,lochnagar.yaml
> new file mode 100644
> index 0000000000000..6a266793ebd16
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/sound/cirrus,lochnagar.yaml
> @@ -0,0 +1,58 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/sound/cirrus,lochnagar.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Cirrus Logic Lochnagar Audio Development Board
> +
> +maintainers:
> + - patches@xxxxxxxxxxxxxxxxxxxxx
> +
> +description: |
> + Lochnagar is an evaluation and development board for Cirrus Logic
> + Smart CODEC and Amp devices. It allows the connection of most Cirrus
> + Logic devices on mini-cards, as well as allowing connection of various
> + application processor systems to provide a full evaluation platform.
> + Audio system topology, clocking and power can all be controlled through
> + the Lochnagar, allowing the device under test to be used in a variety of
> + possible use cases.
> +
> + This binding document describes the binding for the audio portion of the
> + driver.
> +
> + This binding must be part of the Lochnagar MFD binding:
> + [1] ../mfd/cirrus,lochnagar.yaml
> +
> +properties:
> + lochnagar-sc:
> + type: object
> +
> + properties:
> + compatible:
> + contains:
> + enum:
> + - cirrus,lochnagar2-soundcard
> +
> + '#sound-dai-cells':
> + description:
> + Must be 1. The first cell indicating the audio interface.
'Must be 1' is what the constraint says.
> + const: 1
> +
> + clocks:
> + maxItems: 1
> + description:
> + Master clock source for the sound card, should normally be set to
> + LOCHNAGAR_SOUNDCARD_MCLK provided by the Lochnagar clock driver.
blank line.
> + clock-names:
> + const: mclk
> + description:
> + Must contain the string mclk.
That's what the constraint says already.
> +
> + required:
> + - compatible
> + - '#sound-dai-cells'
> + - clocks
> + - clock-names
> +
> + additionalProperties: false
> --
> 2.11.0
>
