Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…/git/broonie/sound into for-linus

ASoC: Updates for v5.18

Quite a quiet release for ASoC, lots of work on drivers and platforms
but nothing too groundbreaking but not much on the core itself:

 - Start of moving SoF to support multiple IPC mechanisms.
 - Use of NHLT ACPI table to reduce the amount of quirking required for
   Intel systems.
 - Some building blocks for use in forthcoming Intel AVS driver for
   legacy Intel DSP firmwares.
 - Support for AMD PDM, Atmel PDMC, Awinic AW8738, i.MX cards with
   TLV320AIC31xx, Intel machines with CS35L41 and ESSX8336, Mediatek
   MT8181 wideband bluetooth, nVidia Tegra234, Qualcomm SC7280, Renesas
   RZ/V2L, Texas Instruments TAS585M
  • Loading branch information
tiwai committed Mar 21, 2022
2 parents a6d4b68 + 49a24e9 commit 646b907
Show file tree
Hide file tree
Showing 344 changed files with 21,876 additions and 7,212 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ properties:
- const: nvidia,tegra210-aconnect
- items:
- enum:
- nvidia,tegra234-aconnect
- nvidia,tegra186-aconnect
- nvidia,tegra194-aconnect
- const: nvidia,tegra210-aconnect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ properties:
- nvidia,tegra210-adma
- nvidia,tegra186-adma
- items:
- const: nvidia,tegra194-adma
- enum:
- nvidia,tegra234-adma
- nvidia,tegra194-adma
- const: nvidia,tegra186-adma

reg:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ properties:
- enum:
- nvidia,tegra186-agic
- nvidia,tegra194-agic
- nvidia,tegra234-agic
- const: nvidia,tegra210-agic

interrupt-controller: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ properties:
- const: allwinner,sun50i-a64-i2s
- const: allwinner,sun8i-h3-i2s
- const: allwinner,sun50i-h6-i2s
- const: allwinner,sun50i-r329-i2s
- items:
- const: allwinner,sun20i-d1-i2s
- const: allwinner,sun50i-r329-i2s

reg:
maxItems: 1
Expand Down Expand Up @@ -67,6 +71,7 @@ allOf:
- allwinner,sun8i-h3-i2s
- allwinner,sun50i-a64-codec-i2s
- allwinner,sun50i-h6-i2s
- allwinner,sun50i-r329-i2s

then:
required:
Expand Down
25 changes: 0 additions & 25 deletions Documentation/devicetree/bindings/sound/arndale.txt

This file was deleted.

20 changes: 20 additions & 0 deletions Documentation/devicetree/bindings/sound/audio-graph-port.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,24 @@ patternProperties:
description: CPU to Codec rate channels.
$ref: /schemas/types.yaml#/definitions/uint32

dai-tdm-slot-width-map:
description: Mapping of sample widths to slot widths. For hardware
that cannot support a fixed slot width or a slot width always
equal to sample width. A matrix of one or more 3-tuples.
$ref: /schemas/types.yaml#/definitions/uint32-matrix
items:
items:
-
description: Sample width in bits
minimum: 8
maximum: 64
-
description: Slot width in bits
minimum: 8
maximum: 256
-
description: Slot count
minimum: 1
maximum: 64

additionalProperties: true
54 changes: 54 additions & 0 deletions Documentation/devicetree/bindings/sound/awinic,aw8738.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/sound/awinic,aw8738.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Awinic AW8738 Audio Amplifier

maintainers:
- Stephan Gerhold <[email protected]>

description:
The Awinic AW8738 is a simple audio amplifier with different operation modes
(set using one-wire pulse control). The mode configures the speaker-guard
function (primarily the power limit for the amplifier).

allOf:
- $ref: name-prefix.yaml#

properties:
compatible:
const: awinic,aw8738

mode-gpios:
description:
GPIO used for one-wire pulse control. The pin is typically called SHDN
(active-low), but this is misleading since it is actually more than
just a simple shutdown/enable control.
maxItems: 1

awinic,mode:
description: Operation mode (number of pulses for one-wire pulse control)
$ref: /schemas/types.yaml#/definitions/uint32
minimum: 1
maximum: 7

sound-name-prefix: true

required:
- compatible
- mode-gpios
- awinic,mode

additionalProperties: false

examples:
- |
#include <dt-bindings/gpio/gpio.h>
audio-amplifier {
compatible = "awinic,aw8738";
mode-gpios = <&msmgpio 114 GPIO_ACTIVE_HIGH>;
awinic,mode = <5>;
sound-name-prefix = "Speaker Amp";
};
86 changes: 0 additions & 86 deletions Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt

This file was deleted.

Loading

0 comments on commit 646b907

Please sign in to comment.