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.11

There's a lot of changes here but mostly cleanups and driver specific
things, the most user visible change is the support for boot time
selection of Intel DSP firmware which will make it easier for people to
move over to the preferred modern implementations in distros and other
large scale deployments.

This also includes a merge of the new auxillary bus which was done in
anticipation of use by the Intel DSP drivers which didn't quite make it.

 - Lots more cleanups and simplifications from Morimoto-san.
 - Support for some basic DPCM systems in the audio graph card from
   Sameer Pujar.
 - Remove some old pre-DT Freescale drivers for platforms that are now
   DT only.
 - Move selection of which Intel DSP implementation to use to boot time
   rather than requiring it to be selected at build time.
 - Support for Allwinner H6 I2S, Analog Devices ADAU1372, Intel
   Alderlake-S, GMediatek MT8192, NXP i.MX HDMI and XCVR, Realtek RT715,
   Qualcomm SM8250 and simple GPIO based muxes.
  • Loading branch information
tiwai committed Dec 14, 2020
2 parents 175b8d8 + 460aa02 commit 598100b
Show file tree
Hide file tree
Showing 338 changed files with 30,855 additions and 5,058 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ patternProperties:
description:
From common IIO binding. Used to pipe external sigma delta
modulator or internal ADC output to DFSDM channel.
This is not required for "st,stm32-dfsdm-pdm" compatibility as
PDM microphone is binded in Audio DT node.

required:
- io-channels
Expand Down Expand Up @@ -235,6 +233,10 @@ patternProperties:
description: child node

properties:
compatible:
enum:
- st,stm32h7-dfsdm-dai

"#sound-dai-cells":
const: 0

Expand All @@ -244,6 +246,7 @@ patternProperties:
modulator or internal ADC output to DFSDM channel.

required:
- compatible
- "#sound-dai-cells"
- io-channels

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


title: Analog Devices ADAU1372 CODEC

maintainers:
- Alexandre Belloni <[email protected]>

description: |
Analog Devices ADAU1372 four inputs and two outputs codec.
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1372.pdf
properties:
compatible:
enum:
- adi,adau1372

reg:
maxItems: 1

"#sound-dai-cells":
const: 0

clocks:
maxItems: 1

clock-names:
const: "mclk"

powerdown-gpios:
description: GPIO used for hardware power-down.
maxItems: 1

required:
- "#sound-dai-cells"
- compatible
- reg
- clocks
- clock-names

additionalProperties: false

examples:
- |
i2c {
#address-cells = <1>;
#size-cells = <0>;
audio-codec@3c {
compatible = "adi,adau1372";
reg = <0x3c>;
#sound-dai-cells = <0>;
clock-names = "mclk";
clocks = <&adau1372z_xtal>;
};
};
adau1372z_xtal: clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <12288000>;
};
...

61 changes: 0 additions & 61 deletions Documentation/devicetree/bindings/sound/adi,adau1977.txt

This file was deleted.

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

title: Analog Devices ADAU1977/ADAU1978/ADAU1979 Quad ADC with Diagnostics

maintainers:
- Lars-Peter Clausen <[email protected]>
- Bogdan Togorean <[email protected]>

description: |
Analog Devices ADAU1977 and similar quad ADC with Diagnostics
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1977.pdf
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1978.pdf
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1979.pdf
properties:
compatible:
enum:
- adi,adau1977
- adi,adau1978
- adi,adau1979

reg:
maxItems: 1

"#sound-dai-cells":
const: 0

reset-gpios:
maxItems: 1

spi-max-frequency: true

AVDD-supply:
description: Analog power support for the device.

DVDD-supply:
description: Supply voltage for digital core.

adi,micbias:
description: |
Configures the voltage setting for the MICBIAS pin.
$ref: /schemas/types.yaml#/definitions/uint32
enum: [0, 1, 2, 3, 4, 5, 6, 7, 8]
default: 7

required:
- reg
- compatible
- AVDD-supply

additionalProperties: false

examples:
- |
#include <dt-bindings/gpio/gpio.h>
spi {
#address-cells = <1>;
#size-cells = <0>;
adau1977_spi: adau1977@0 {
compatible = "adi,adau1977";
reg = <0>;
spi-max-frequency = <600000>;
AVDD-supply = <&regulator>;
DVDD-supply = <&regulator_digital>;
reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
adi,micbias = <3>;
};
};
- |
#include <dt-bindings/gpio/gpio.h>
i2c {
#address-cells = <1>;
#size-cells = <0>;
adau1977_i2c: adau1977@11 {
compatible = "adi,adau1977";
reg = <0x11>;
AVDD-supply = <&regulator>;
DVDD-supply = <&regulator_digital>;
reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ properties:
- items:
- const: allwinner,sun50i-a64-i2s
- const: allwinner,sun8i-h3-i2s
- const: allwinner,sun50i-h6-i2s

reg:
maxItems: 1
Expand Down Expand Up @@ -59,6 +60,7 @@ allOf:
- allwinner,sun8i-a83t-i2s
- allwinner,sun8i-h3-i2s
- allwinner,sun50i-a64-codec-i2s
- allwinner,sun50i-h6-i2s

then:
required:
Expand All @@ -68,7 +70,9 @@ allOf:
properties:
compatible:
contains:
const: allwinner,sun8i-a83t-i2s
enum:
- allwinner,sun8i-a83t-i2s
- allwinner,sun8i-h3-i2s

then:
properties:
Expand Down
Loading

0 comments on commit 598100b

Please sign in to comment.