Commit 86d0d3ee authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.14-merge-window' of... 

Merge tag 'asoc-fix-v6.14-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.14

A bunch of fixes that came in during the merge window, plus a few new
device IDs.  The i.MX changes are a little large since they add some new
quirk data as well as device IDs, and the audio graph card change for
picking the correct endpoint for links is large due to updating a number
of call sites.
parents 3b430954 6c1bb403

Documentation/devicetree/bindings/arm/fsl.yaml

+3 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,7 @@ properties: 
              - dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC

              - emcraft,imx8mp-navqp      # i.MX8MP Emcraft Systems NavQ+ Kit

              - fsl,imx8mp-evk            # i.MX8MP EVK Board

              - fsl,imx8mp-evk-revb4      # i.MX8MP EVK Rev B4 Board

              - gateworks,imx8mp-gw71xx-2x # i.MX8MP Gateworks Board

              - gateworks,imx8mp-gw72xx-2x # i.MX8MP Gateworks Board

              - gateworks,imx8mp-gw73xx-2x # i.MX8MP Gateworks Board
@@ -1262,6 +1263,7 @@ properties: 
        items:

          - enum:

              - fsl,imx8qm-mek           # i.MX8QM MEK Board

              - fsl,imx8qm-mek-revd      # i.MX8QM MEK Rev D Board

              - toradex,apalis-imx8      # Apalis iMX8 Modules

              - toradex,apalis-imx8-v1.1 # Apalis iMX8 V1.1 Modules

          - const: fsl,imx8qm
@@ -1290,6 +1292,7 @@ properties: 
          - enum:

              - einfochips,imx8qxp-ai_ml  # i.MX8QXP AI_ML Board

              - fsl,imx8qxp-mek           # i.MX8QXP MEK Board

              - fsl,imx8qxp-mek-wcpu      # i.MX8QXP MEK WCPU Board

          - const: fsl,imx8qxp



      - description: i.MX8DXL based Boards

Documentation/devicetree/bindings/sound/ti,pcm1681.yaml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
$id: http://devicetree.org/schemas/sound/ti,pcm1681.yaml#

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



title: Texas Instruments PCM1681 8-channel PWM Processor

title: Texas Instruments PCM1681 8-channel Digital-to-Analog Converter



maintainers:

  - Shenghao Ding <shenghao-ding@ti.com>

drivers/firmware/cirrus/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -6,15 +6,13 @@ config FW_CS_DSP 


config FW_CS_DSP_KUNIT_TEST_UTILS

	tristate

	depends on KUNIT

	select REGMAP

	depends on KUNIT && REGMAP

	select FW_CS_DSP



config FW_CS_DSP_KUNIT_TEST

	tristate "KUnit tests for Cirrus Logic cs_dsp" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && REGMAP

	default KUNIT_ALL_TESTS

	select REGMAP

	select FW_CS_DSP

	select FW_CS_DSP_KUNIT_TEST_UTILS

	help

sound/soc/amd/acp/acp-i2s.c

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ static int acp_i2s_set_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, u32 rx_mas 
			break;

		default:

			dev_err(dev, "Unknown chip revision %d\n", chip->acp_rev);

			spin_unlock_irq(&adata->acp_lock);

			return -EINVAL;

		}

	}

sound/soc/amd/yc/acp6x-mach.c

+28 −0
Original line number Diff line number Diff line
@@ -304,6 +304,34 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "83AS"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83L3"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83N6"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83Q2"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83Q3"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {