Commit 3f9df564 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "This became wide and scattered updates all over the sound tree as
  diffstat shows: lots of (still ongoing) refactoring works in ASoC,
  fixes and cleanups caught by static analysis, inclusive term
  conversions as well as lots of new drivers. Below are highlights:

  ASoC core:
   - API cleanups and conversions to the unified mute_stream() call
   - Simplify I/O helper functions
   - Use helper macros to retrieve RTD from substreams

  ASoC drivers:
   - Lots of fixes and cleanups in Intel ASoC drivers
   - Lots of new stuff: Freescale MQS and i.MX6sx, Intel KeemBay I2S,
     Maxim MAX98360A and MAX98373 SoundWire, various Mediatek boards,
     nVidia Tegra 186 and 210, RealTek RL6231, Samsung Midas and Aries
     boards, TI J721e EVM

  ALSA core:
   - Minor code refacotring for SG-buffer handling

  HD-audio:
   - Generalization of mute-LED handling with LED classdev
   - Intel silent stream support for HDMI
   - Device-specific fixes: CA0132, Loongson-3

  Others:
   - Usual USB- and HD-audio quirks for various devices
   - Fixes for echoaudio DMA position handling
   - Various documents and trivial fixes for sparse warnings
   - Conversion to adopt inclusive terms"

* tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (479 commits)
  ALSA: pci: delete repeated words in comments
  ALSA: isa: delete repeated words in comments
  ALSA: hda/tegra: Add 100us dma stop delay
  ALSA: hda: Add dma stop delay variable
  ASoC: hda/tegra: Set buffer alignment to 128 bytes
  ALSA: seq: oss: Serialize ioctls
  ALSA: hda/hdmi: Add quirk to force connectivity
  ALSA: usb-audio: add startech usb audio dock name
  ALSA: usb-audio: Add support for Lenovo ThinkStation P620
  Revert "ALSA: hda: call runtime_allow() for all hda controllers"
  ALSA: hda/ca0132 - Fix AE-5 microphone selection commands.
  ALSA: hda/ca0132 - Add new quirk ID for Recon3D.
  ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.
  ALSA: hda/realtek: Add alc269/alc662 pin-tables for Loongson-3 laptops
  ALSA: docs: fix typo
  ALSA: doc: use correct config variable name
  ASoC: core: Two step component registration
  ASoC: core: Simplify snd_soc_component_initialize declaration
  ASoC: core: Relocate and expose snd_soc_component_initialize
  ASoC: sh: Replace 'select' DMADEVICES 'with depends on'
  ...
parents 921d2597 c7fabbc5

Documentation/devicetree/bindings/sound/adi,adau1977.txt

+3 −3
Original line number Diff line number Diff line 
Analog Devices ADAU1977/ADAU1978/ADAU1979



Datasheets:

http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1977.pdf

http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1978.pdf

http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1979.pdf

https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1977.pdf

https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1978.pdf

https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1979.pdf



This driver supports both the I2C and SPI bus.

Documentation/devicetree/bindings/sound/ak4613.txt

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
AK4613 I2C transmitter



This device supports I2C mode only.



Required properties:



- compatible : "asahi-kasei,ak4613"

- reg : The chip select number on the I2C bus



Optional properties:

- asahi-kasei,in1-single-end	: Boolean. Indicate input / output pins are single-ended.

- asahi-kasei,in2-single-end	  rather than differential.

- asahi-kasei,out1-single-end

- asahi-kasei,out2-single-end

- asahi-kasei,out3-single-end

- asahi-kasei,out4-single-end

- asahi-kasei,out5-single-end

- asahi-kasei,out6-single-end



Example:



&i2c {

	ak4613: ak4613@10 {

		compatible = "asahi-kasei,ak4613";

		reg = <0x10>;

	};

};

Documentation/devicetree/bindings/sound/ak4613.yaml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/ak4613.yaml#

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



title: AK4613 I2C transmitter Device Tree Bindings



maintainers:

  - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>



properties:

  compatible:

    const: asahi-kasei,ak4613



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  "#sound-dai-cells":

    const: 0



patternProperties:

  "^asahi-kasei,in[1-2]-single-end$":

    description: Input Pin 1 - 2.

    $ref: /schemas/types.yaml#/definitions/flag



  "^asahi-kasei,out[1-6]-single-end$":

    description: Output Pin 1 - 6.

    $ref: /schemas/types.yaml#/definitions/flag



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        ak4613: codec@10 {

            compatible = "asahi-kasei,ak4613";

            reg = <0x10>;

        };

    };

Documentation/devicetree/bindings/sound/ak4642.txt

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
AK4642 I2C transmitter



This device supports I2C mode only.



Required properties:



  - compatible : "asahi-kasei,ak4642" or "asahi-kasei,ak4643" or "asahi-kasei,ak4648"

  - reg : The chip select number on the I2C bus



Optional properties:



  - #clock-cells :		common clock binding; shall be set to 0

  - clocks :			common clock binding; MCKI clock

  - clock-frequency :		common clock binding; frequency of MCKO

  - clock-output-names :	common clock binding; MCKO clock name



Example 1:



&i2c {

	ak4648: ak4648@12 {

		compatible = "asahi-kasei,ak4642";

		reg = <0x12>;

	};

};



Example 2:



&i2c {

	ak4643: codec@12 {

		compatible = "asahi-kasei,ak4643";

		reg = <0x12>;

		#clock-cells = <0>;

		clocks = <&audio_clock>;

		clock-frequency = <12288000>;

		clock-output-names = "ak4643_mcko";

	};

};

Documentation/devicetree/bindings/sound/ak4642.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/ak4642.yaml#

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



title: AK4642 I2C transmitter Device Tree Bindings



maintainers:

  - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>



properties:

  compatible:

    enum:

      - asahi-kasei,ak4642

      - asahi-kasei,ak4643

      - asahi-kasei,ak4648



  reg:

    maxItems: 1



  "#clock-cells":

    const: 0

  "#sound-dai-cells":

    const: 0



  clocks:

    maxItems: 1



  clock-frequency:

    description: common clock binding; frequency of MCKO

    $ref: /schemas/types.yaml#/definitions/uint32



  clock-output-names:

    description: common clock name

    $ref: /schemas/types.yaml#/definitions/string



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        ak4643: codec@12 {

            compatible = "asahi-kasei,ak4643";

            #sound-dai-cells = <0>;

            reg = <0x12>;

            #clock-cells = <0>;

            clocks = <&audio_clock>;

            clock-frequency = <12288000>;

            clock-output-names = "ak4643_mcko";

        };

    };

CRA Git | Maintained and supported by SUSTech CRA and CCSE