Commit 534e9cf3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v6.16-2' of... 

Merge tag 'asoc-v6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Additional v6.16 updates

A couple more updates on top of the last set I sent you, a new driver
for the ES8375 and a fix for the Cirrus KUnit tests from Jaroslav.
parents aca89f1b 43a38a0f

Documentation/devicetree/bindings/sound/everest,es8375.yaml

0 → 100644
+71 −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/everest,es8375.yaml#

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



title: Everest ES8375 audio CODEC



maintainers:

  - Michael Zhang <zhangyi@everest-semi.com>



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    const: everest,es8375



  reg:

    maxItems: 1



  clocks:

    items:

      - description: clock for master clock (MCLK)



  clock-names:

    items:

      - const: mclk



  vdda-supply:

    description:

      Analogue power supply.



  vddd-supply:

    description:

      Interface power supply.



  everest,mclk-src:

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

    description: |

      Represents the MCLK/SCLK pair pins used as the internal clock.

      0 represents selecting MCLK.

      1 represents selecting SCLK.

    enum: [0, 1]

    default: 0



  "#sound-dai-cells":

    const: 0



required:

  - compatible

  - reg

  - "#sound-dai-cells"

  - vdda-supply

  - vddd-supply



additionalProperties: false



examples:

  - |

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;

      es8375: codec@18 {

        compatible = "everest,es8375";

        reg = <0x18>;

        vdda-supply = <&vdd3v3>;

        vddd-supply = <&vdd3v3>;

        #sound-dai-cells = <0>;

      };

    };

drivers/firmware/cirrus/test/cs_dsp_mock_bin.c

+2 −1
Original line number Diff line number Diff line
@@ -96,10 +96,11 @@ static void cs_dsp_mock_bin_add_name_or_info(struct cs_dsp_mock_bin_builder *bui 


	if (info_len % 4) {

		/* Create a padded string with length a multiple of 4 */

		size_t copy_len = info_len;

		info_len = round_up(info_len, 4);

		tmp = kunit_kzalloc(builder->test_priv->test, info_len, GFP_KERNEL);

		KUNIT_ASSERT_NOT_ERR_OR_NULL(builder->test_priv->test, tmp);

		memcpy(tmp, info, info_len);

		memcpy(tmp, info, copy_len);

		info = tmp;

	}

sound/soc/codecs/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ config SND_SOC_ALL_CODECS 
	imply SND_SOC_ES8326

	imply SND_SOC_ES8328_SPI

	imply SND_SOC_ES8328_I2C

	imply SND_SOC_ES8375

	imply SND_SOC_ES8389

	imply SND_SOC_ES7134

	imply SND_SOC_ES7241
@@ -1212,6 +1213,10 @@ config SND_SOC_ES8328_SPI 
	depends on SPI_MASTER

	select SND_SOC_ES8328



config SND_SOC_ES8375

	tristate "Everest Semi ES8375 CODEC"

	depends on I2C



config SND_SOC_ES8389

	tristate "Everest Semi ES8389 CODEC"

	depends on I2C

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ snd-soc-es8326-y := es8326.o 
snd-soc-es8328-y := es8328.o

snd-soc-es8328-i2c-y := es8328-i2c.o

snd-soc-es8328-spi-y := es8328-spi.o

snd-soc-es8375-y := es8375.o

snd-soc-es8389-y := es8389.o

snd-soc-framer-y := framer-codec.o

snd-soc-gtm601-y := gtm601.o
@@ -557,6 +558,7 @@ obj-$(CONFIG_SND_SOC_ES8326) += snd-soc-es8326.o 
obj-$(CONFIG_SND_SOC_ES8328)	+= snd-soc-es8328.o

obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o

obj-$(CONFIG_SND_SOC_ES8328_SPI)+= snd-soc-es8328-spi.o

obj-$(CONFIG_SND_SOC_ES8375)    += snd-soc-es8375.o

obj-$(CONFIG_SND_SOC_ES8389)    += snd-soc-es8389.o

obj-$(CONFIG_SND_SOC_FRAMER)	+= snd-soc-framer.o

obj-$(CONFIG_SND_SOC_GTM601)    += snd-soc-gtm601.o

sound/soc/codecs/es8375.c

0 → 100644
+793 −0

File added.

Preview size limit exceeded, changes collapsed.