forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kern…
…el/git/tiwai/sound Pull sound updates from Takashi Iwai: "The amount of changes is smaller at this round (what a surprise), but lots of activity is seen. Most of changes are about ASoC driver development, especially Intel platforms. Here are some highlights: General: - Replace all tasklet usages with other alternatives - Cleanup of the ASoC error unwinding code - Fixes for trivial issues caught by static checker - Spell fixes allover the places ALSA Core: - Lockdep fix for control devices - Fix for potential OSS sequencer mutex stalls HD-audio and USB-audio: - SoundBlaster AE-7 support - Changes in quirk table for the rename handling - Quirks for HP and ASUS machines, Pioneer DJ DJM-250MK2. ASoC: - Lots of updates for Intel SOF and SoundWire enablement - Replacement of the DSP driver for some older x86 systems; the new code was written from scratch, better maintenance expected - Helpers for parsing auxiluary devices from the device tree - New support for AllWinner A64, Cirrus Logic CS4234, Mediatek MT6359 Microchip S/PDIF TX and RX controllers, Realtek RT1015P, and Texas Instruments J721E, TAS2110, TAS2564 and TAS2764" * tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (498 commits) ALSA: hda/hdmi: fix incorrect locking in hdmi_pcm_close ALSA: hda: fix jack detection with Realtek codecs when in D3 ALSA: fireworks: use semicolons rather than commas to separate statements ALSA: hda: use semicolons rather than commas to separate statements ALSA: hda/i915 - fix list corruption with concurrent probes ASoC: dmaengine: Document support for TX only or RX only streams ASoC: mchp-spdiftx: remove 'TX' from playback stream name ASoC: ti: davinci-mcasp: Use &pdev->dev for early dev_warn ASoC: tas2764: Add the driver for the TAS2764 dt-bindings: tas2764: Add the TAS2764 binding doc ASoC: Intel: catpt: Add explicit DMADEVICES kconfig dependency ASoC: Intel: catpt: Fix compilation when CONFIG_MODULES is disabled ASoC: stm32: dfsdm: add actual resolution trace ASoC: stm32: dfsdm: change rate limits ASoC: qcom: sc7180: Add support for audio over DP Asoc: qcom: lpass-platform : Increase buffer size ASoC: qcom: Add support for lpass hdmi driver Asoc: qcom: lpass:Update lpaif_dmactl members order Asoc:qcom:lpass-cpu:Update dts property read API ASoC: dt-bindings: Add dt binding for lpass hdmi ...
- Loading branch information
Showing
380 changed files
with
25,537 additions
and
13,525 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
What: /sys/devices/pci0000:00/<dev>/fw_version | ||
Date: September 2020 | ||
Contact: Cezary Rojewski <[email protected]> | ||
Description: | ||
Version of AudioDSP firmware ASoC catpt driver is | ||
communicating with. | ||
Format: %d.%d.%d.%d, type:major:minor:build. | ||
|
||
What: /sys/devices/pci0000:00/<dev>/fw_info | ||
Date: September 2020 | ||
Contact: Cezary Rojewski <[email protected]> | ||
Description: | ||
Detailed AudioDSP firmware build information including | ||
build hash and log-providers hash. This information is | ||
obtained during initial handshake with firmware. | ||
Format: %s. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
Documentation/devicetree/bindings/sound/cirrus,cs4234.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# SPDX-License-Identifier: (GPL-2.0+ OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/sound/cirrus,cs4234.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Cirrus Logic cs4234 audio CODEC | ||
|
||
maintainers: | ||
- [email protected] | ||
|
||
description: | ||
The CS4234 is a highly versatile CODEC that combines 4 channels of | ||
high performance analog to digital conversion, 4 channels of high | ||
performance digital to analog conversion for audio, and 1 channel of | ||
digital to analog conversion to provide a nondelayed audio reference | ||
signal to an external Class H tracking power supply. If not used to | ||
drive a tracking power supply, the 5th DAC can instead be used as a | ||
standard audio grade DAC, with performance specifications identical | ||
to that of the 4 DACs in the audio path. Additionally, the CS4234 | ||
includes tunable group delay for each of the 4 audio DAC paths to | ||
provide lead time for the external switch-mode power supply, and a | ||
nondelayed path into the DAC outputs for input signals requiring a | ||
low-latency path to the outputs. | ||
|
||
properties: | ||
compatible: | ||
enum: | ||
- cirrus,cs4234 | ||
|
||
reg: | ||
description: | ||
The 7-bit I2C address depends on the state of the ADx pins, in | ||
binary given by [0 0 1 0 AD2 AD1 AD0 0]. | ||
items: | ||
minimum: 0x10 | ||
maximum: 0x17 | ||
|
||
VA-supply: | ||
description: | ||
Analogue power supply. | ||
|
||
VL-supply: | ||
description: | ||
Interface power supply. | ||
|
||
reset-gpios: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- VA-supply | ||
- VL-supply | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
i2c@e0004000 { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
reg = <0xe0004000 0x1000>; | ||
cs4234: codec@11 { | ||
compatible = "cirrus,cs4234"; | ||
reg = <0x11>; | ||
VA-supply = <&vdd3v3>; | ||
VL-supply = <&vdd3v3>; | ||
reset-gpios = <&gpio 0>; | ||
}; | ||
}; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/sound/fsl,spdif.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Freescale Sony/Philips Digital Interface Format (S/PDIF) Controller | ||
|
||
maintainers: | ||
- Shengjiu Wang <[email protected]> | ||
|
||
description: | | ||
The Freescale S/PDIF audio block is a stereo transceiver that allows the | ||
processor to receive and transmit digital audio via an coaxial cable or | ||
a fibre cable. | ||
properties: | ||
compatible: | ||
enum: | ||
- fsl,imx35-spdif | ||
- fsl,vf610-spdif | ||
- fsl,imx6sx-spdif | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
dmas: | ||
items: | ||
- description: DMA controller phandle and request line for RX | ||
- description: DMA controller phandle and request line for TX | ||
|
||
dma-names: | ||
items: | ||
- const: rx | ||
- const: tx | ||
|
||
clocks: | ||
items: | ||
- description: The core clock of spdif controller. | ||
- description: Clock for tx0 and rx0. | ||
- description: Clock for tx1 and rx1. | ||
- description: Clock for tx2 and rx2. | ||
- description: Clock for tx3 and rx3. | ||
- description: Clock for tx4 and rx4. | ||
- description: Clock for tx5 and rx5. | ||
- description: Clock for tx6 and rx6. | ||
- description: Clock for tx7 and rx7. | ||
- description: The spba clock is required when SPDIF is placed as a bus | ||
slave of the Shared Peripheral Bus and when two or more bus masters | ||
(CPU, DMA or DSP) try to access it. This property is optional depending | ||
on the SoC design. | ||
minItems: 9 | ||
|
||
clock-names: | ||
items: | ||
- const: core | ||
- const: rxtx0 | ||
- const: rxtx1 | ||
- const: rxtx2 | ||
- const: rxtx3 | ||
- const: rxtx4 | ||
- const: rxtx5 | ||
- const: rxtx6 | ||
- const: rxtx7 | ||
- const: spba | ||
minItems: 9 | ||
|
||
big-endian: | ||
$ref: /schemas/types.yaml#/definitions/flag | ||
description: | | ||
If this property is absent, the native endian mode will be in use | ||
as default, or the big endian mode will be in use for all the device | ||
registers. Set this flag for HCDs with big endian descriptors and big | ||
endian registers. | ||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- dmas | ||
- dma-names | ||
- clocks | ||
- clock-names | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
spdif@2004000 { | ||
compatible = "fsl,imx35-spdif"; | ||
reg = <0x02004000 0x4000>; | ||
interrupts = <0 52 0x04>; | ||
dmas = <&sdma 14 18 0>, | ||
<&sdma 15 18 0>; | ||
dma-names = "rx", "tx"; | ||
clocks = <&clks 197>, <&clks 3>, | ||
<&clks 197>, <&clks 107>, | ||
<&clks 0>, <&clks 118>, | ||
<&clks 62>, <&clks 139>, | ||
<&clks 0>; | ||
clock-names = "core", "rxtx0", | ||
"rxtx1", "rxtx2", | ||
"rxtx3", "rxtx4", | ||
"rxtx5", "rxtx6", | ||
"rxtx7"; | ||
big-endian; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,7 @@ properties: | |
compatible: | ||
enum: | ||
- intel,keembay-i2s | ||
- intel,keembay-tdm | ||
|
||
"#sound-dai-cells": | ||
const: 0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.