Skip to content

Commit

Permalink
Merge tag 'sound-5.6-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:
 "As the diffstat shows we've had again a lot of works done for this
  cycle: the majority of changes are the continued componentization and
  code refactoring in ASoC, the tree-wide PCM API updates and cleanups
  and SOF updates while a few ASoC driver updates are seen, too.

  Here we go, some highlights:

  Core:
   - Finally y2038 support landed to ALSA ABI; some ioctls have been
     extended and lots of tricks were applied
   - Applying the new managed PCM buffer API to all drivers; the API
     itself was already merged in 5.5
   - The already deprecated dimension support in ALSA control API is
     dropped completely now
   - Verification of ALSA control elements to catch API misuses

  ASoC:
   - Further code refactorings and moving things to the component level
   - Lots of updates and improvements on SOF / Intel drivers; now
     including common HDMI driver and SoundWire support
   - New driver support for Ingenic JZ4770, Mediatek MT6660, Qualcomm
     WCD934x and WSA881x, and Realtek RT700, RT711, RT715, RT1011,
     RT1015 and RT1308

  HD-audio:
   - Improved ring-buffer communications using waitqueue
   - Drop the superfluous buffer preallocation on x86

  Others:
   - Many code cleanups, mostly constifications over the whole tree
   - USB-audio: quirks for MOTU, Corsair Virtuoso, Line6 Helix
   - FireWire: code refactoring for oxfw and dice drivers"

* tag 'sound-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (638 commits)
  ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82
  ALSA: hda: Add Clevo W65_67SB the power_save blacklist
  ASoC: soc-core: remove null_snd_soc_ops
  ASoC: soc-pcm: add soc_rtd_trigger()
  ASoC: soc-pcm: add soc_rtd_hw_free()
  ASoC: soc-pcm: add soc_rtd_hw_params()
  ASoC: soc-pcm: add soc_rtd_prepare()
  ASoC: soc-pcm: add soc_rtd_shutdown()
  ASoC: soc-pcm: add soc_rtd_startup()
  ASoC: rt1015: add rt1015 amplifier driver
  ASoC: madera: Correct some kernel doc
  ASoC: topology: fix soc_tplg_fe_link_create() - link->dobj initialization order
  ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug
  ASoC: madera: Correct DMIC only input hook ups
  ALSA: cs46xx: fix spelling mistake "to" -> "too"
  ALSA: hda - Add docking station support for Lenovo Thinkpad T420s
  ASoC: Add MediaTek MT6660 Speaker Amp Driver
  ASoC: dt-bindings: rt5645: add suppliers
  ASoC: max98090: fix deadlock in max98090_dapm_put_enum_double()
  ASoC: dapm: add snd_soc_dapm_put_enum_double_locked
  ...
  • Loading branch information
torvalds committed Jan 29, 2020
2 parents bd2463a + 90fb04f commit fb95aae
Show file tree
Hide file tree
Showing 617 changed files with 27,603 additions and 8,124 deletions.
4 changes: 4 additions & 0 deletions Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Required properties:
* "arb" : memory ARB line (required)
* "rst" : dedicated device reset line (optional)
- #sound-dai-cells: must be 0.
- amlogic,fifo-depth: The size of the controller's fifo in bytes. This
is useful for determining certain configuration such
as the flush threshold of the fifo

Example of FRDDR A on the A113 SoC:

Expand All @@ -27,4 +30,5 @@ frddr_a: audio-controller@1c0 {
interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
resets = <&arb AXG_ARB_FRDDR_A>;
fifo-depth = <512>;
};
12 changes: 11 additions & 1 deletion Documentation/devicetree/bindings/sound/fsl,asrc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ three substreams within totally 10 channels.

Required properties:

- compatible : Contains "fsl,imx35-asrc" or "fsl,imx53-asrc".
- compatible : Compatible list, should contain one of the following
compatibles:
"fsl,imx35-asrc",
"fsl,imx53-asrc",
"fsl,imx8qm-asrc",
"fsl,imx8qxp-asrc",

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

Expand All @@ -35,6 +40,11 @@ Required properties:

- fsl,asrc-width : Defines a mutual sample width used by DPCM Back Ends.

- fsl,asrc-clk-map : Defines clock map used in driver. which is required
by imx8qm/imx8qxp platform
<0> - select the map for asrc0 in imx8qm/imx8qxp
<1> - select the map for asrc1 in imx8qm/imx8qxp

Optional properties:

- big-endian : If this property is absent, the little endian mode
Expand Down
10 changes: 8 additions & 2 deletions Documentation/devicetree/bindings/sound/gtm601.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
GTM601 UMTS modem audio interface CODEC

This device has no configuration interface. Sample rate is fixed - 8kHz.
This device has no configuration interface. The sample rate and channels are
based on the compatible string
"option,gtm601" = 8kHz mono
"broadmobi,bm818" = 48KHz stereo

Required properties:

- compatible : "option,gtm601"
- compatible : one of
"option,gtm601"
"broadmobi,bm818"


Example:

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

title: Ingenic JZ47xx internal codec DT bindings

maintainers:
- Paul Cercueil <[email protected]>

properties:
$nodename:
pattern: '^audio-codec@.*'

compatible:
oneOf:
- const: ingenic,jz4770-codec
- const: ingenic,jz4725b-codec
- const: ingenic,jz4740-codec

reg:
maxItems: 1

clocks:
maxItems: 1

clock-names:
items:
- const: aic

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

additionalProperties: false

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

examples:
- |
#include <dt-bindings/clock/jz4740-cgu.h>
codec: audio-codec@10020080 {
compatible = "ingenic,jz4740-codec";
reg = <0x10020080 0x8>;
#sound-dai-cells = <0>;
clocks = <&cgu JZ4740_CLK_AIC>;
clock-names = "aic";
};
...
20 changes: 0 additions & 20 deletions Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt

This file was deleted.

20 changes: 0 additions & 20 deletions Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt

This file was deleted.

5 changes: 4 additions & 1 deletion Documentation/devicetree/bindings/sound/qcom,sdm845.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ This binding describes the SDM845 sound card, which uses qdsp for audio.
- compatible:
Usage: required
Value type: <stringlist>
Definition: must be "qcom,sdm845-sndcard"
Definition: must be one of this
"qcom,sdm845-sndcard"
"qcom,db845c-sndcard"
"lenovo,yoga-c630-sndcard"

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

title: Bindings for Qualcomm WCD9340/WCD9341 Audio Codec

maintainers:
- Srinivas Kandagatla <[email protected]>

description: |
Qualcomm WCD9340/WCD9341 Codec is a standalone Hi-Fi audio codec IC.
It has in-built Soundwire controller, pin controller, interrupt mux and
supports both I2S/I2C and SLIMbus audio interfaces.
properties:
compatible:
const: slim217,250

reg:
maxItems: 1

interrupts:
maxItems: 1

reset-gpios:
description: GPIO spec for reset line to use
maxItems: 1

slim-ifc-dev: true

clocks:
maxItems: 1

clock-names:
const: extclk

vdd-buck-supply:
description: A reference to the 1.8V buck supply

vdd-buck-sido-supply:
description: A reference to the 1.8V SIDO buck supply

vdd-rx-supply:
description: A reference to the 1.8V rx supply

vdd-tx-supply:
description: A reference to the 1.8V tx supply

vdd-vbat-supply:
description: A reference to the vbat supply

vdd-io-supply:
description: A reference to the 1.8V I/O supply

vdd-micbias-supply:
description: A reference to the micbias supply

qcom,micbias1-microvolt:
description: micbias1 voltage
minimum: 1800000
maximum: 2850000

qcom,micbias2-microvolt:
description: micbias2 voltage
minimum: 1800000
maximum: 2850000

qcom,micbias3-microvolt:
description: micbias3 voltage
minimum: 1800000
maximum: 2850000

qcom,micbias4-microvolt:
description: micbias4 voltage
minimum: 1800000
maximum: 2850000

clock-output-names:
const: mclk

clock-frequency:
description: Clock frequency of output clk in Hz

interrupt-controller: true

'#interrupt-cells':
const: 1

'#clock-cells':
const: 0

'#sound-dai-cells':
const: 1

"#address-cells":
const: 1

"#size-cells":
const: 1

gpio@42:
type: object
allOf:
- $ref: ../gpio/qcom,wcd934x-gpio.yaml#

patternProperties:
"^.*@[0-9a-f]+$":
type: object
description: |
WCD934x subnode for each slave devices. Bindings of each subnodes
depends on the specific driver providing the functionality and
documented in their respective bindings.
properties:
reg:
maxItems: 1

required:
- reg

required:
- compatible
- reg
- reset-gpios
- slim-ifc-dev
- interrupts
- interrupt-controller
- clock-frequency
- clock-output-names
- qcom,micbias1-microvolt
- qcom,micbias2-microvolt
- qcom,micbias3-microvolt
- qcom,micbias4-microvolt
- "#interrupt-cells"
- "#clock-cells"
- "#sound-dai-cells"
- "#address-cells"
- "#size-cells"

examples:
- |
codec@1,0{
compatible = "slim217,250";
reg = <1 0>;
reset-gpios = <&tlmm 64 0>;
slim-ifc-dev = <&wcd9340_ifd>;
#sound-dai-cells = <1>;
interrupt-parent = <&tlmm>;
interrupts = <54 4>;
interrupt-controller;
#interrupt-cells = <1>;
#clock-cells = <0>;
clock-frequency = <9600000>;
clock-output-names = "mclk";
qcom,micbias1-microvolt = <1800000>;
qcom,micbias2-microvolt = <1800000>;
qcom,micbias3-microvolt = <1800000>;
qcom,micbias4-microvolt = <1800000>;
clock-names = "extclk";
clocks = <&rpmhcc 2>;
#address-cells = <1>;
#size-cells = <1>;
gpio@42 {
compatible = "qcom,wcd9340-gpio";
reg = <0x42 0x2>;
gpio-controller;
#gpio-cells = <2>;
};
};
...
Loading

0 comments on commit fb95aae

Please sign in to comment.