Skip to content

Commit

Permalink
Merge tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This became wide and scattered updates all over the sound tree as
  diffstat shows: lots of (still ongoing) refactoring works in ASoC,
  fixes and cleanups caught by static analysis, inclusive term
  conversions as well as lots of new drivers. Below are highlights:

  ASoC core:
   - API cleanups and conversions to the unified mute_stream() call
   - Simplify I/O helper functions
   - Use helper macros to retrieve RTD from substreams

  ASoC drivers:
   - Lots of fixes and cleanups in Intel ASoC drivers
   - Lots of new stuff: Freescale MQS and i.MX6sx, Intel KeemBay I2S,
     Maxim MAX98360A and MAX98373 SoundWire, various Mediatek boards,
     nVidia Tegra 186 and 210, RealTek RL6231, Samsung Midas and Aries
     boards, TI J721e EVM

  ALSA core:
   - Minor code refacotring for SG-buffer handling

  HD-audio:
   - Generalization of mute-LED handling with LED classdev
   - Intel silent stream support for HDMI
   - Device-specific fixes: CA0132, Loongson-3

  Others:
   - Usual USB- and HD-audio quirks for various devices
   - Fixes for echoaudio DMA position handling
   - Various documents and trivial fixes for sparse warnings
   - Conversion to adopt inclusive terms"

* tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (479 commits)
  ALSA: pci: delete repeated words in comments
  ALSA: isa: delete repeated words in comments
  ALSA: hda/tegra: Add 100us dma stop delay
  ALSA: hda: Add dma stop delay variable
  ASoC: hda/tegra: Set buffer alignment to 128 bytes
  ALSA: seq: oss: Serialize ioctls
  ALSA: hda/hdmi: Add quirk to force connectivity
  ALSA: usb-audio: add startech usb audio dock name
  ALSA: usb-audio: Add support for Lenovo ThinkStation P620
  Revert "ALSA: hda: call runtime_allow() for all hda controllers"
  ALSA: hda/ca0132 - Fix AE-5 microphone selection commands.
  ALSA: hda/ca0132 - Add new quirk ID for Recon3D.
  ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.
  ALSA: hda/realtek: Add alc269/alc662 pin-tables for Loongson-3 laptops
  ALSA: docs: fix typo
  ALSA: doc: use correct config variable name
  ASoC: core: Two step component registration
  ASoC: core: Simplify snd_soc_component_initialize declaration
  ASoC: core: Relocate and expose snd_soc_component_initialize
  ASoC: sh: Replace 'select' DMADEVICES 'with depends on'
  ...
  • Loading branch information
torvalds committed Aug 6, 2020
2 parents 921d259 + c7fabbc commit 3f9df56
Show file tree
Hide file tree
Showing 688 changed files with 17,934 additions and 5,766 deletions.
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/sound/adi,adau1977.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Analog Devices ADAU1977/ADAU1978/ADAU1979

Datasheets:
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1977.pdf
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1978.pdf
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1979.pdf
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

This driver supports both the I2C and SPI bus.

Expand Down
27 changes: 0 additions & 27 deletions Documentation/devicetree/bindings/sound/ak4613.txt

This file was deleted.

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

title: AK4613 I2C transmitter Device Tree Bindings

maintainers:
- Kuninori Morimoto <[email protected]>

properties:
compatible:
const: asahi-kasei,ak4613

reg:
maxItems: 1

clocks:
maxItems: 1

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

patternProperties:
"^asahi-kasei,in[1-2]-single-end$":
description: Input Pin 1 - 2.
$ref: /schemas/types.yaml#/definitions/flag

"^asahi-kasei,out[1-6]-single-end$":
description: Output Pin 1 - 6.
$ref: /schemas/types.yaml#/definitions/flag

required:
- compatible
- reg

additionalProperties: false

examples:
- |
i2c {
#address-cells = <1>;
#size-cells = <0>;
ak4613: codec@10 {
compatible = "asahi-kasei,ak4613";
reg = <0x10>;
};
};
37 changes: 0 additions & 37 deletions Documentation/devicetree/bindings/sound/ak4642.txt

This file was deleted.

58 changes: 58 additions & 0 deletions Documentation/devicetree/bindings/sound/ak4642.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/sound/ak4642.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: AK4642 I2C transmitter Device Tree Bindings

maintainers:
- Kuninori Morimoto <[email protected]>

properties:
compatible:
enum:
- asahi-kasei,ak4642
- asahi-kasei,ak4643
- asahi-kasei,ak4648

reg:
maxItems: 1

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

clocks:
maxItems: 1

clock-frequency:
description: common clock binding; frequency of MCKO
$ref: /schemas/types.yaml#/definitions/uint32

clock-output-names:
description: common clock name
$ref: /schemas/types.yaml#/definitions/string

required:
- compatible
- reg

additionalProperties: false

examples:
- |
i2c {
#address-cells = <1>;
#size-cells = <0>;
ak4643: codec@12 {
compatible = "asahi-kasei,ak4643";
#sound-dai-cells = <0>;
reg = <0x12>;
#clock-cells = <0>;
clocks = <&audio_clock>;
clock-frequency = <12288000>;
clock-output-names = "ak4643_mcko";
};
};
23 changes: 0 additions & 23 deletions Documentation/devicetree/bindings/sound/everest,es8316.txt

This file was deleted.

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

title: Everest ES8316 audio CODEC

maintainers:
- Daniel Drake <[email protected]>
- Katsuhiro Suzuki <[email protected]>

properties:
compatible:
const: everest,es8316

reg:
maxItems: 1

clocks:
items:
- description: clock for master clock (MCLK)

clock-names:
items:
- const: mclk

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

required:
- compatible
- reg
- "#sound-dai-cells"

additionalProperties: false

examples:
- |
i2c0 {
#address-cells = <1>;
#size-cells = <0>;
es8316: codec@11 {
compatible = "everest,es8316";
reg = <0x11>;
clocks = <&clks 10>;
clock-names = "mclk";
#sound-dai-cells = <0>;
};
};
6 changes: 5 additions & 1 deletion Documentation/devicetree/bindings/sound/fsl,spdif.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ a fibre cable.

Required properties:

- compatible : Compatible list, must contain "fsl,imx35-spdif".
- compatible : Compatible list, should contain one of the following
compatibles:
"fsl,imx35-spdif",
"fsl,vf610-spdif",
"fsl,imx6sx-spdif",

- reg : Offset and length of the register set for the device.

Expand Down
20 changes: 16 additions & 4 deletions Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ The compatible list for this generic sound card currently:

"fsl,imx-audio-wm8960"

"fsl,imx-audio-mqs"

"fsl,imx-audio-wm8524"

Required properties:

- compatible : Contains one of entries in the compatible list.
Expand All @@ -44,6 +48,11 @@ Required properties:

- audio-codec : The phandle of an audio codec

Optional properties:

- audio-asrc : The phandle of ASRC. It can be absent if there's no
need to add ASRC support via DPCM.

- audio-routing : A list of the connections between audio components.
Each entry is a pair of strings, the first being the
connection's sink, the second being the connection's
Expand All @@ -60,10 +69,13 @@ Required properties:
coexisting in order to support the old bindings
of wm8962 and sgtl5000.

Optional properties:

- audio-asrc : The phandle of ASRC. It can be absent if there's no
need to add ASRC support via DPCM.
- hp-det-gpio : The GPIO that detect headphones are plugged in
- mic-det-gpio : The GPIO that detect microphones are plugged in
- bitclock-master : Indicates dai-link bit clock master; for details see simple-card.yaml.
- frame-master : Indicates dai-link frame master; for details see simple-card.yaml.
- dai-format : audio format, for details see simple-card.yaml.
- frame-inversion : dai-link uses frame clock inversion, for details see simple-card.yaml.
- bitclock-inversion : dai-link uses bit clock inversion, for details see simple-card.yaml.

Optional unless SSI is selected as a CPU DAI:

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

title: Intel KeemBay I2S Device Tree Bindings

maintainers:
- Sia, Jee Heng <[email protected]>

description: |
Intel KeemBay I2S
properties:
compatible:
enum:
- intel,keembay-i2s

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

reg:
items:
- description: I2S registers
- description: I2S gen configuration

reg-names:
items:
- const: i2s-regs
- const: i2s_gen_cfg

interrupts:
maxItems: 1

clocks:
items:
- description: Bus Clock
- description: Module Clock

clock-names:
items:
- const: osc
- const: apb_clk

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

examples:
- |
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h>
#define KEEM_BAY_PSS_AUX_I2S3
#define KEEM_BAY_PSS_I2S3
i2s3: i2s@20140000 {
compatible = "intel,keembay-i2s";
#sound-dai-cells = <0>;
reg = <0x20140000 0x200>, /* I2S registers */
<0x202a00a4 0x4>; /* I2S gen configuration */
reg-names = "i2s-regs", "i2s_gen_cfg";
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "osc", "apb_clk";
clocks = <&scmi_clk KEEM_BAY_PSS_AUX_I2S3>, <&scmi_clk KEEM_BAY_PSS_I2S3>;
};
Loading

0 comments on commit 3f9df56

Please sign in to comment.