Commit c468b5dd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus 



Pull 6.7 materials

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 99248c89 f71e0be5

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

+6 −14
Original line number Diff line number Diff line
@@ -13,19 +13,17 @@ select: false 


definitions:

  port-base:

    $ref: /schemas/graph.yaml#/$defs/port-base

    allOf:

      - $ref: /schemas/graph.yaml#/$defs/port-base

      - $ref: /schemas/sound/dai-params.yaml#

    properties:

      convert-rate:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

      convert-channels:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

      convert-sample-format:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format

      mclk-fs:

        $ref: simple-card.yaml#/definitions/mclk-fs



  endpoint-base:

    $ref: /schemas/graph.yaml#/$defs/endpoint-base

    allOf:

      - $ref: /schemas/graph.yaml#/$defs/endpoint-base

      - $ref: /schemas/sound/dai-params.yaml#

    properties:

      mclk-fs:

        $ref: simple-card.yaml#/definitions/mclk-fs
@@ -68,12 +66,6 @@ definitions: 
            - pdm

            - msb

            - lsb

      convert-rate:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

      convert-channels:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

      convert-sample-format:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format



      dai-tdm-slot-num:

        description: Number of slots in use.

Documentation/devicetree/bindings/sound/audio-graph.yaml

+3 −6
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Audio Graph 
maintainers:

  - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>



allOf:

  - $ref: /schemas/sound/dai-params.yaml#



properties:

  dais:

    $ref: /schemas/types.yaml#/definitions/phandle-array
@@ -30,12 +33,6 @@ properties: 
      widget ("Microphone", "Line", "Headphone", "Speaker"), the

      second being the machine specific name for the widget.

    $ref: /schemas/types.yaml#/definitions/non-unique-string-array

  convert-rate:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

  convert-channels:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

  convert-sample-format:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format



  pa-gpios:

    maxItems: 1

Documentation/devicetree/bindings/sound/awinic,aw87390.yaml

0 → 100644
+58 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/awinic,aw87390.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Awinic Aw87390 Audio Amplifier



maintainers:

  - Weidong Wang <wangweidong.a@awinic.com>



description:

  The awinic aw87390 is specifically designed to improve

  the musical output dynamic range, enhance the overall

  sound quallity, which is a new high efficiency, low

  noise, constant large volume, 6th Smart K audio amplifier.



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    const: awinic,aw87390



  reg:

    maxItems: 1



  "#sound-dai-cells":

    const: 0



  awinic,audio-channel:

    description:

      It is used to distinguish multiple PA devices, so that different

      configurations can be loaded to different PA devices

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 7



required:

  - compatible

  - reg

  - "#sound-dai-cells"

  - awinic,audio-channel



unevaluatedProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        audio-codec@58 {

            compatible = "awinic,aw87390";

            reg = <0x58>;

            #sound-dai-cells = <0>;

            awinic,audio-channel = <0>;

        };

    };

Documentation/devicetree/bindings/sound/awinic,aw88395.yaml

+28 −4
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ description: 
  digital Smart K audio amplifier with an integrated 10.25V

  smart boost convert.



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    enum:
@@ -32,11 +29,36 @@ properties: 
  reset-gpios:

    maxItems: 1



  awinic,audio-channel:

    description:

      It is used to distinguish multiple PA devices, so that different

      configurations can be loaded to different PA devices

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 7



  awinic,sync-flag:

    description:

      Flag bit used to keep the phase synchronized in the case of multiple PA

    $ref: /schemas/types.yaml#/definitions/flag



required:

  - compatible

  - reg

  - '#sound-dai-cells'

  - reset-gpios

  - awinic,audio-channel



allOf:

  - $ref: dai-common.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - awinic,aw88261

    then:

      properties:

        reset-gpios: false



unevaluatedProperties: false
@@ -51,5 +73,7 @@ examples: 
            reg = <0x34>;

            #sound-dai-cells = <0>;

            reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;

            awinic,audio-channel = <0>;

            awinic,sync-flag;

        };

    };

Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ properties: 
      Current at which the headset micbias sense clamp will engage, 0 to

      disable.

    enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ]

    default: 0

    default: 14



  cirrus,bias-ramp-ms:

    description:
@@ -97,7 +97,7 @@ properties: 
      Time in microseconds the type detection will run for. Long values will

      cause more audible effects, but give more accurate detection.

    enum: [ 20, 100, 1000, 10000, 50000, 75000, 100000, 200000 ]

    default: 10000

    default: 1000



  cirrus,button-automute:

    type: boolean