forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 23
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.17-rc1' of git://git.kernel.org/pub/scm/linux/kern…
…el/git/tiwai/sound Pull sound updates from Takashi Iwai: "It's a relatively calm development cycle, but still lots of updates in the driver side like Intel SOF. Below are some highlights: ALSA / ASoC core: - A new kselftest for ALSA control API - PCM NO_REWINDS support - Potential race fixes around control removals - Unify x86 SG-buffer memory allocation code - Cleanups and race fixes for ASoC DPCM locking ASoC: - Refinements and cleanups around the delay() APIs - Wider use of dev_err_probe(). - Continuing cleanups and improvements to the SOF code - Support for pin switches in simple-card derived cards - Support for AMD Renoir ACP, Asahi Kasei Microdevices AKM4375, Intel systems using NAU8825 and MAX98390, Mediatek MT8915, nVidia Tegra20 S/PDIF, Qualcomm systems using ALC5682I-VS and Texas Instruments TLV320ADC3xxx HD-audio / USB-audio: - Fix deadlock at HD-audio codec unbinding - Fixes for Tegra194 HD-audio, new HDA support for CS35L41 codec - Quirks for Lenovo and HP machines, Gigabyte mobo, Bose device Misc: - Fix virmidi drain behavior Note that the merge of CS35L41 codec support is still half-baked, and at least one ACPI change is missing. Although this won't hinder the kernel build itself, we're going to catch up before RC1" * tag 'sound-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (415 commits) ALSA: hda: intel-dsp-config: reorder the config table ALSA: hda: intel-dsp-config: add JasperLake support ALSA: hda: cs35l41: fix double free on error in probe() ALSA: hda: Fix dependencies of CS35L41 on SPI/I2C buses ALSA: hda: Fix dependency on ASoC cs35l41 codec ASoC: cs35l41: Add support for hibernate memory retention mode ASoC: cs35l41: Update handling of test key registers ALSA: intel_hdmi: Check for error num after setting mask ASoC: wcd9335: Keep a RX port value for each SLIM RX mux ASoC: amd: acp: acp-mach: Change default RT1019 amp dev id ALSA: virmidi: Remove duplicated code ALSA: seq: virmidi: Add a drain operation ASoC: topology: Fix typo ASoC: fsl_asrc: refine the check of available clock divider ASoC: Intel: bytcr_rt5640: Add support for external GPIO jack-detect ASoC: Intel: bytcr_rt5640: Support retrieving the codec IRQ from the AMCR0F28 ACPI dev ASoC: rt5640: Add support for boards with an external jack-detect GPIO ASoC: rt5640: Allow snd_soc_component_set_jack() to override the codec IRQ ASoC: rt5640: Change jack_work to a delayed_work ASoC: rt5640: Fix possible NULL pointer deref on resume ...
- Loading branch information
Showing
414 changed files
with
17,555 additions
and
5,674 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,57 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/sound/ak4375.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: AK4375 DAC and headphones amplifier Device Tree Bindings | ||
|
||
maintainers: | ||
- Vincent Knecht <vincent.knecht@mailoo.org> | ||
|
||
properties: | ||
compatible: | ||
const: asahi-kasei,ak4375 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
'#sound-dai-cells': | ||
const: 0 | ||
|
||
avdd-supply: | ||
description: regulator phandle for the AVDD power supply. | ||
|
||
tvdd-supply: | ||
description: regulator phandle for the TVDD power supply. | ||
|
||
pdn-gpios: | ||
description: optional GPIO to set the PDN pin. | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- '#sound-dai-cells' | ||
- avdd-supply | ||
- tvdd-supply | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/gpio/gpio.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
headphones: audio-codec@10 { | ||
compatible = "asahi-kasei,ak4375"; | ||
reg = <0x10>; | ||
avdd-supply = <®_headphones_avdd>; | ||
tvdd-supply = <&pm8916_l6>; | ||
pdn-gpios = <&msmgpio 114 GPIO_ACTIVE_HIGH>; | ||
pinctrl-names = "default"; | ||
pinctrl-0 = <&headphones_pdn_default>; | ||
#sound-dai-cells = <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
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
225 changes: 225 additions & 0 deletions
225
Documentation/devicetree/bindings/sound/cirrus,cs42l42.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,225 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/sound/cirrus,cs42l42.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Cirrus Logic CS42L42 audio CODEC | ||
|
||
maintainers: | ||
- patches@opensource.cirrus.com | ||
|
||
description: | ||
The CS42L42 is a low-power audio codec designed for portable applications. | ||
It provides a high-dynamic range, stereo DAC for audio playback and a mono | ||
high-dynamic-range ADC for audio capture. There is an integrated headset | ||
detection block. | ||
|
||
properties: | ||
compatible: | ||
enum: | ||
- cirrus,cs42l42 | ||
|
||
reg: | ||
description: | ||
The I2C address of the CS42L42. | ||
maxItems: 1 | ||
|
||
VP-supply: | ||
description: | ||
VP power supply. | ||
|
||
VCP-supply: | ||
description: | ||
Charge pump power supply. | ||
|
||
VD_FILT-supply: | ||
description: | ||
FILT+ power supply. | ||
|
||
VL-supply: | ||
description: | ||
Logic power supply. | ||
|
||
VA-supply: | ||
description: | ||
Analog power supply. | ||
|
||
reset-gpios: | ||
description: | ||
This pin will be asserted and then deasserted to reset the | ||
CS42L42 before communication starts. | ||
maxItems: 1 | ||
|
||
interrupts: | ||
description: | ||
Interrupt for CS42L42 IRQ line. | ||
maxItems: 1 | ||
|
||
cirrus,ts-inv: | ||
description: | | ||
Sets the behaviour of the jack plug detect switch. | ||
0 - (Default) Shorted to tip when unplugged, open when plugged. | ||
This is "inverted tip sense (ITS)" in the datasheet. | ||
1 - Open when unplugged, shorted to tip when plugged. | ||
This is "normal tip sense (TS)" in the datasheet. | ||
The CS42L42_TS_INV_* defines are available for this. | ||
$ref: "/schemas/types.yaml#/definitions/uint32" | ||
minimum: 0 | ||
maximum: 1 | ||
|
||
cirrus,ts-dbnc-rise: | ||
description: | | ||
Debounce the rising edge of TIP_SENSE_PLUG. With no | ||
debounce, the tip sense pin might be noisy on a plug event. | ||
0 - 0ms | ||
1 - 125ms | ||
2 - 250ms | ||
3 - 500ms | ||
4 - 750ms | ||
5 - 1s (Default) | ||
6 - 1.25s | ||
7 - 1.5s | ||
The CS42L42_TS_DBNCE_* defines are available for this. | ||
$ref: "/schemas/types.yaml#/definitions/uint32" | ||
minimum: 0 | ||
maximum: 7 | ||
|
||
cirrus,ts-dbnc-fall: | ||
description: | | ||
Debounce the falling edge of TIP_SENSE_UNPLUG. With no | ||
debounce, the tip sense pin might be noisy on an unplug event. | ||
0 - 0ms | ||
1 - 125ms | ||
2 - 250ms | ||
3 - 500ms | ||
4 - 750ms | ||
5 - 1s (Default) | ||
6 - 1.25s | ||
7 - 1.5s | ||
The CS42L42_TS_DBNCE_* defines are available for this. | ||
$ref: "/schemas/types.yaml#/definitions/uint32" | ||
minimum: 0 | ||
maximum: 7 | ||
|
||
cirrus,btn-det-init-dbnce: | ||
description: | | ||
This sets how long to wait after enabling button detection | ||
interrupts before servicing button interrupts, to allow the | ||
HS bias time to settle. Value is in milliseconds. | ||
There may be erroneous button interrupts if this debounce time | ||
is too short. | ||
0ms - 200ms, | ||
Default = 100ms | ||
$ref: "/schemas/types.yaml#/definitions/uint32" | ||
minimum: 0 | ||
maximum: 200 | ||
|
||
cirrus,btn-det-event-dbnce: | ||
description: | | ||
This sets how long to wait after receiving a button press | ||
interrupt before processing it. Allows time for the button | ||
press to make a clean connection with the bias resistors. | ||
Value is in milliseconds. | ||
0ms - 20ms, | ||
Default = 10ms | ||
$ref: "/schemas/types.yaml#/definitions/uint32" | ||
minimum: 0 | ||
maximum: 20 | ||
|
||
cirrus,bias-lvls: | ||
description: | | ||
For a level-detect headset button scheme, each button will bias | ||
the mic pin to a certain voltage. To determine which button was | ||
pressed, the voltage is compared to sequential, decreasing | ||
voltages, until the compared voltage < bias voltage. | ||
For different hardware setups, a designer might want to tweak this. | ||
This is an array of descending values for the comparator voltage, | ||
given as percent of the HSBIAS voltage. | ||
Array of 4 values, each 0-63 | ||
< x1 x2 x3 x4 > | ||
Default = < 15 8 4 1 > | ||
$ref: /schemas/types.yaml#/definitions/uint32-array | ||
minItems: 4 | ||
maxItems: 4 | ||
items: | ||
minimum: 0 | ||
maximum: 63 | ||
|
||
cirrus,hs-bias-ramp-rate: | ||
description: | | ||
If present this sets the rate that the HS bias should rise and fall. | ||
The actual rise and fall times depend on external hardware (the | ||
datasheet gives several rise and fall time examples). | ||
0 - Fast rise time; slow, load-dependent fall time | ||
1 - Fast | ||
2 - Slow (default) | ||
3 - Slowest | ||
The CS42L42_HSBIAS_RAMP_* defines are available for this. | ||
$ref: "/schemas/types.yaml#/definitions/uint32" | ||
minimum: 0 | ||
maximum: 3 | ||
|
||
cirrus,hs-bias-sense-disable: | ||
description: | | ||
If present the HSBIAS sense is disabled. Configures HSBIAS output | ||
current sense through the external 2.21-k resistor. HSBIAS_SENSE | ||
is a hardware feature to reduce the potential pop noise when the | ||
headset plug is removed slowly. But on some platforms ESD voltage | ||
will affect it causing plug detection to fail, especially with CTIA | ||
headset type. For different hardware setups, a designer might want | ||
to tweak default behavior. | ||
type: boolean | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- VP-supply | ||
- VCP-supply | ||
- VD_FILT-supply | ||
- VL-supply | ||
- VA-supply | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/sound/cs42l42.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
cs42l42: cs42l42@48 { | ||
compatible = "cirrus,cs42l42"; | ||
reg = <0x48>; | ||
VA-supply = <&dummy_vreg>; | ||
VP-supply = <&dummy_vreg>; | ||
VCP-supply = <&dummy_vreg>; | ||
VD_FILT-supply = <&dummy_vreg>; | ||
VL-supply = <&dummy_vreg>; | ||
reset-gpios = <&axi_gpio_0 1 0>; | ||
interrupt-parent = <&gpio0>; | ||
interrupts = <55 8>; | ||
cirrus,ts-inv = <CS42L42_TS_INV_DIS>; | ||
cirrus,ts-dbnc-rise = <CS42L42_TS_DBNCE_1000>; | ||
cirrus,ts-dbnc-fall = <CS42L42_TS_DBNCE_0>; | ||
cirrus,btn-det-init-dbnce = <100>; | ||
cirrus,btn-det-event-dbnce = <10>; | ||
cirrus,bias-lvls = <0x0F 0x08 0x04 0x01>; | ||
cirrus,hs-bias-ramp-rate = <CS42L42_HSBIAS_RAMP_SLOW>; | ||
}; | ||
}; |
Oops, something went wrong.