Commit 12cc3d53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound updates from Takashi Iwai:
 "Lots of changes in this cycle, but mostly for cleanups and
  refactoring.

  Significant amount of changes are about DT schema conversions for ASoC
  at this time while we see other usual suspects, too.

  Some highlights below:

  Core:
   - Re-introduction of PCM sync ID support API
   - MIDI2 time-base extension in ALSA sequencer API

  ASoC:
   - Syncing of features between simple-audio-card and the two
     audio-graph cards
   - Support for specifying the order of operations for components
     within cards to allow quirking for unusual systems
   - Lots of DT schema conversions
   - Continued SOF/Intel updates for topology, SoundWire, IPC3/4
   - New support for Asahi Kasei AK4619, Cirrus Logic CS530x, Everest
     Semiconductors ES8311, NXP i.MX95 and LPC32xx, Qualcomm LPASS v2.5
     and WCD937x, Realtek RT1318 and RT1320 and Texas Instruments
     PCM5242

  HD-audio:
   - More quirks, Intel PantherLake support, senarytech codec support
   - Refactoring of Cirrus codec component-binding

  Others:
   - ALSA control kselftest improvements, and fixes for input value
     checks in various drivers"

* tag 'sound-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (349 commits)
  kselftest/alsa: Log the PCM ID in pcm-test
  kselftest/alsa: Use card name rather than number in test names
  ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book Pro 360
  ALSA: hda/tas2781: Add new quirk for Lenovo Hera2 Laptop
  ALSA: seq: ump: Skip useless ports for static blocks
  ALSA: pcm_dmaengine: Don't synchronize DMA channel when DMA is paused
  ALSA: usb: Use BIT() for bit values
  ALSA: usb: Fix UBSAN warning in parse_audio_unit()
  ALSA: hda/realtek: Enable headset mic on Positivo SU C1400
  ASoC: tas2781: Add new Kontrol to set tas2563 digital Volume
  ASoC: codecs: wcd937x: Remove separate handling for vdd-buck supply
  ASoC: codecs: wcd937x: Remove the string compare in MIC BIAS widget settings
  ASoC: codecs: wcd937x-sdw: Fix Unbalanced pm_runtime_enable
  ASoC: dt-bindings: cirrus,cs42xx8: Convert to dtschema
  ASoC: cs530x: Remove bclk from private structure
  ASoC: cs530x: Calculate proper bclk rate using TDM
  ASoC: dt-bindings: cirrus,cs4270: Convert to dtschema
  firmware: cs_dsp: Rename fw_ver to wmfw_ver
  firmware: cs_dsp: Clarify wmfw format version log message
  firmware: cs_dsp: Make wmfw and bin filename arguments const char *
  ...
parents a4f92855 4594d26f

Documentation/devicetree/bindings/sound/ak4104.txt

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
AK4104 S/PDIF transmitter



This device supports SPI mode only.



Required properties:



  - compatible : "asahi-kasei,ak4104"



  - reg : The chip select number on the SPI bus



  - vdd-supply : A regulator node, providing 2.7V - 3.6V



Optional properties:



  - reset-gpios : a GPIO spec for the reset pin. If specified, it will be

		  deasserted before communication to the device starts.



Example:



spdif: ak4104@0 {

	compatible = "asahi-kasei,ak4104";

	reg = <0>;

	spi-max-frequency = <5000000>;

	vdd-supply = <&vdd_3v3_reg>;

};

Documentation/devicetree/bindings/sound/ak4554.txt

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
AK4554 ADC/DAC



Required properties:



  - compatible : "asahi-kasei,ak4554"



Example:



ak4554-adc-dac {

	compatible = "asahi-kasei,ak4554";

};

Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
* Amlogic HDMI Tx control glue



Required properties:

- compatible: "amlogic,g12a-tohdmitx" or

	      "amlogic,sm1-tohdmitx"

- reg: physical base address of the controller and length of memory

       mapped region.

- #sound-dai-cells: should be 1.

- resets: phandle to the dedicated reset line of the hdmitx glue.



Example on the S905X2 SoC:



tohdmitx: audio-controller@744 {

	compatible = "amlogic,g12a-tohdmitx";

	reg = <0x0 0x744 0x0 0x4>;

	#sound-dai-cells = <1>;

	resets = <&clkc_audio AUD_RESET_TOHDMITX>;

};



Example of an 'amlogic,axg-sound-card':



sound {

	compatible = "amlogic,axg-sound-card";



[...]



	dai-link-x {

		sound-dai = <&tdmif_a>;

		dai-format = "i2s";

		dai-tdm-slot-tx-mask-0 = <1 1>;



		codec-0 {

			sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;

		};



		codec-1 {

			sound-dai = <&external_dac>;

		};

	};



	dai-link-y {

		sound-dai = <&tdmif_c>;

		dai-format = "i2s";

		dai-tdm-slot-tx-mask-0 = <1 1>;



		codec {

			sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>;

		};

	};



	dai-link-z {

		sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;



		codec {

			sound-dai = <&hdmi_tx>;

		};

	};

};

Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.yaml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/amlogic,g12a-tohdmitx.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Amlogic G12a HDMI TX Control Glue



maintainers:

  - Jerome Brunet <jbrunet@baylibre.com>



allOf:

  - $ref: dai-common.yaml#



properties:

  $nodename:

    pattern: "^audio-controller@.*"



  compatible:

    oneOf:

      - items:

          - const: amlogic,g12a-tohdmitx

      - items:

          - enum:

              - amlogic,sm1-tohdmitx

          - const: amlogic,g12a-tohdmitx



  reg:

    maxItems: 1



  resets:

    maxItems: 1



  "#sound-dai-cells":

    const: 1



required:

  - compatible

  - reg

  - resets

  - "#sound-dai-cells"



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>



    tohdmitx: audio-controller@744 {

        compatible = "amlogic,g12a-tohdmitx";

        reg = <0x744 0x4>;

        resets = <&clkc_audio AUD_RESET_TOHDMITX>;

        #sound-dai-cells = <1>;

    };

Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ properties: 


  audio-widgets:

    $ref: /schemas/types.yaml#/definitions/non-unique-string-array

    minItems: 2

    description: |-

      A list off component DAPM widget. Each entry is a pair of strings,

      the first being the widget type, the second being the widget name