Skip to content

Commit

Permalink
Merge tag 'sound-6.8-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:
 "It was a calm development cycle. There were an ALSA core extension for
  subformat PCM bits and a few ASoC core changes to support N:M
  mappings, while the most of remaining changes are driver-specific.

  Core:
   - API extensions for properly limiting PCM format bits via subformat
   - Enhanced support for N:M CPU:CODEC mappings in the core and in
     audio-graph-card2

  ASoC:
   - Lots of SOF updates: fallback support to older IPC versions,
     notification on control changes with IPC4. Also supports for ACPI
     parse for the ES83xx driver that reduces quirks.
   - Device tree support for describing parts of the card which can be
     active over suspend (for very low power playback or wake word use
     cases)
   - Support for more AMD and Intel systems, NXP i.MX8m MICFIL, Qualcomm
     SM8250, SM8550, SM8650 and X1E80100
   - Drop of Freescale MPC8610 code that is no longer supported

  HD-audio:
   - More CS35L41 codec extensions for Dell, HP and Lenovo models
   - TAS2781 codec extensions for Lenovo and co
   - New PCM subformat supports

  Others:
   - More enhancement for Scarlett2 USB mixer support
   - Various kselftest fixes"

* tag 'sound-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (337 commits)
  kselftest/alsa - conf: Stringify the printed errno in sysfs_get()
  kselftest/alsa - mixer-test: Fix the print format specifier warning
  kselftest/alsa - mixer-test: Fix the print format specifier warning
  kselftest/alsa - mixer-test: fix the number of parameters to ksft_exit_fail_msg()
  ALSA: hda/tas2781: annotate calibration data endianness
  ALSA: hda/realtek: Fix mute and mic-mute LEDs for HP Envy X360 13-ay0xxx
  ALSA: hda/conexant: Fix headset auto detect fail in cx8070 and SN6140
  ALSA: ac97: fix build regression
  ALSA: hda: cs35l41: Support more HP models without _DSD
  ALSA: hda/tas2781: add fixup for Lenovo 14ARB7
  ALSA: hda/tas2781: add TAS2563 support for 14ARB7
  ALSA: hda/tas2781: add configurable global i2c address
  ALSA: hda/tas2781: add ptrs to calibration functions
  ALSA: hda: Add driver properties for cs35l41 for Lenovo Legion Slim 7 Gen 8 serie
  ALSA: hda/realtek: enable SND_PCI_QUIRK for Lenovo Legion Slim 7 Gen 8 (2023) serie
  ALSA: hda/tas2781: configure the amp after firmware load
  ALSA: mark all struct bus_type as const
  ASoC: pxa: sspa: Don't select SND_ARM
  ASoC: rt5663: cancel the work when system suspends
  ALSA: scarlett2: Add PCM Input Switch for Solo Gen 4
  ...
  • Loading branch information
torvalds committed Jan 12, 2024
2 parents cf65598 + fd38dd6 commit 7912a63
Show file tree
Hide file tree
Showing 287 changed files with 10,674 additions and 4,060 deletions.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/sound/adi,max98363.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ unevaluatedProperties: false

examples:
- |
soundwire-controller@3250000 {
soundwire@3250000 {
#address-cells = <2>;
#size-cells = <0>;
reg = <0x3250000 0x2000>;
Expand Down
6 changes: 6 additions & 0 deletions Documentation/devicetree/bindings/sound/audio-graph-port.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ definitions:
properties:
mclk-fs:
$ref: simple-card.yaml#/definitions/mclk-fs
playback-only:
description: port connection used only for playback
$ref: /schemas/types.yaml#/definitions/flag
capture-only:
description: port connection used only for capture
$ref: /schemas/types.yaml#/definitions/flag

endpoint-base:
allOf:
Expand Down
38 changes: 0 additions & 38 deletions Documentation/devicetree/bindings/sound/es8328.txt

This file was deleted.

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

title: Everest ES8328 audio CODEC

description:
Everest Audio Codec, which can be connected via I2C or SPI.
Pins on the device (for linking into audio routes) are
* LOUT1
* LOUT2
* ROUT1
* ROUT2
* LINPUT1
* RINPUT1
* LINPUT2
* RINPUT2
* Mic Bias

maintainers:
- David Yang <[email protected]>

properties:
compatible:
enum:
- everest,es8328
- everest,es8388

reg:
maxItems: 1

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

clocks:
items:
- description: A 22.5792 or 11.2896 MHz clock

DVDD-supply:
description: Regulator providing digital core supply voltage 1.8 - 3.6V

AVDD-supply:
description: Regulator providing analog supply voltage 3.3V

PVDD-supply:
description: Regulator providing digital IO supply voltage 1.8 - 3.6V

HPVDD-supply:
description: Regulator providing analog output voltage 3.3V

required:
- compatible
- clocks
- DVDD-supply
- AVDD-supply
- PVDD-supply
- HPVDD-supply

additionalProperties: false

examples:
- |
i2c {
#address-cells = <1>;
#size-cells = <0>;
es8328: codec@11 {
compatible = "everest,es8328";
reg = <0x11>;
AVDD-supply = <&reg_3p3v>;
DVDD-supply = <&reg_3p3v>;
HPVDD-supply = <&reg_3p3v>;
PVDD-supply = <&reg_3p3v>;
clocks = <&clks 169>;
};
};
36 changes: 0 additions & 36 deletions Documentation/devicetree/bindings/sound/fsl,mqs.txt

This file was deleted.

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

title: NXP Medium Quality Sound (MQS)

maintainers:
- Shengjiu Wang <[email protected]>
- Chancel Liu <[email protected]>

description: |
Medium quality sound (MQS) is used to generate medium quality audio
via a standard GPIO in the pinmux, allowing the user to connect
stereo speakers or headphones to a power amplifier without an
additional DAC chip.
properties:
compatible:
enum:
- fsl,imx6sx-mqs
- fsl,imx8qm-mqs
- fsl,imx8qxp-mqs
- fsl,imx93-mqs

clocks:
minItems: 1
maxItems: 2

clock-names:
minItems: 1
maxItems: 2

gpr:
$ref: /schemas/types.yaml#/definitions/phandle
description: The phandle to the General Purpose Register (GPR) node

reg:
maxItems: 1

power-domains:
maxItems: 1

resets:
maxItems: 1

required:
- compatible
- clocks
- clock-names

allOf:
- if:
properties:
compatible:
contains:
enum:
- fsl,imx8qm-mqs
- fsl,imx8qxp-mqs
then:
properties:
clocks:
items:
- description: Master clock
- description: Clock for register access
clock-names:
items:
- const: mclk
- const: core
required:
- reg
- power-domains
else:
properties:
clocks:
items:
- description: Master clock
clock-names:
items:
- const: mclk
required:
- gpr

additionalProperties: false

examples:
- |
#include <dt-bindings/clock/imx6sx-clock.h>
mqs0: mqs {
compatible = "fsl,imx6sx-mqs";
gpr = <&gpr>;
clocks = <&clks IMX6SX_CLK_SAI1>;
clock-names = "mclk";
};
- |
#include <dt-bindings/firmware/imx/rsrc.h>
mqs1: mqs@59850000 {
compatible = "fsl,imx8qm-mqs";
reg = <0x59850000 0x10000>;
clocks = <&mqs0_lpcg 0>, <&mqs0_lpcg 1>;
clock-names = "mclk", "core";
power-domains = <&pd IMX_SC_R_MQS_0>;
};
22 changes: 21 additions & 1 deletion Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ properties:
- const: txfifo

interrupts:
maxItems: 1
items:
- description: WAKEUPMIX Audio XCVR Interrupt 1
- description: WAKEUPMIX Audio XCVR Interrupt 2
minItems: 1

clocks:
items:
Expand Down Expand Up @@ -78,6 +81,23 @@ required:
- dma-names
- resets

allOf:
- if:
properties:
compatible:
contains:
enum:
- fsl,imx93-xcvr
then:
properties:
interrupts:
minItems: 2
maxItems: 2
else:
properties:
interrupts:
maxItems: 1

additionalProperties: false

examples:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ allOf:
properties:
compatible:
enum:
- mediatek,mt8188-es8326
- mediatek,mt8188-mt6359-evb
- mediatek,mt8188-nau8825
- mediatek,mt8188-rt5682s
Expand Down
9 changes: 9 additions & 0 deletions Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ properties:
$ref: /schemas/types.yaml#/definitions/uint32
default: 3072000

nuvoton,dmic-slew-rate:
description: The range 0 to 7 represents the speed of DMIC slew rate.
The lowest value 0 means the slowest rate and the highest value
7 means the fastest rate.
$ref: /schemas/types.yaml#/definitions/uint32
maximum: 7
default: 0

nuvoton,left-input-single-end:
description: Enable left input with single-ended settings if set.
For the headset mic application, the single-ended control is
Expand Down Expand Up @@ -127,6 +135,7 @@ examples:
nuvoton,jack-insert-debounce = <7>;
nuvoton,jack-eject-debounce = <0>;
nuvoton,dmic-clk-threshold = <3072000>;
nuvoton,dmic-slew-rate = <0>;
#sound-dai-cells = <0>;
};
};
23 changes: 15 additions & 8 deletions Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,18 @@ maintainers:

properties:
compatible:
enum:
- qcom,sc7280-lpass-rx-macro
- qcom,sm8250-lpass-rx-macro
- qcom,sm8450-lpass-rx-macro
- qcom,sm8550-lpass-rx-macro
- qcom,sc8280xp-lpass-rx-macro
oneOf:
- enum:
- qcom,sc7280-lpass-rx-macro
- qcom,sm8250-lpass-rx-macro
- qcom,sm8450-lpass-rx-macro
- qcom,sm8550-lpass-rx-macro
- qcom,sc8280xp-lpass-rx-macro
- items:
- enum:
- qcom,sm8650-lpass-rx-macro
- qcom,x1e80100-lpass-rx-macro
- const: qcom,sm8550-lpass-rx-macro

reg:
maxItems: 1
Expand Down Expand Up @@ -96,8 +102,9 @@ allOf:
- if:
properties:
compatible:
enum:
- qcom,sm8550-lpass-rx-macro
contains:
enum:
- qcom,sm8550-lpass-rx-macro
then:
properties:
clocks:
Expand Down
Loading

0 comments on commit 7912a63

Please sign in to comment.