Commit ecc8b4d0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

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

ASoC: Fixes for v6.6

A bunch of fixes and new IDs that came in since the initial pull request
- all driver specific and nothing too exciting.

There's a trivial conflict in the AMD driver ID table due to the last
v6.5 fixes not having been merged up.
parents e43252db cfff2a77

Documentation/devicetree/bindings/sound/fsl,easrc.yaml

+7 −1
Original line number Diff line number Diff line
@@ -14,7 +14,13 @@ properties: 
    pattern: "^easrc@.*"



  compatible:

    const: fsl,imx8mn-easrc

    oneOf:

      - enum:

          - fsl,imx8mn-easrc

      - items:

          - enum:

              - fsl,imx8mp-easrc

          - const: fsl,imx8mn-easrc



  reg:

    maxItems: 1

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -21064,7 +21064,7 @@ F: sound/soc/ti/ 
TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIVERS

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

M:	Kevin Lu <kevin-lu@ti.com>

M:	Baojun Xu <x1077012@ti.com>

M:	Baojun Xu <baojun.xu@ti.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/sound/tas2552.txt

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

+14 −0
Original line number Diff line number Diff line
@@ -213,6 +213,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "21J6"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82TL"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -325,6 +332,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "8A22"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),

			DMI_MATCH(DMI_BOARD_NAME, "8A3E"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -1968,11 +1968,15 @@ config SND_SOC_UDA1380 
	tristate

	depends on I2C



config SND_SOC_WCD_CLASSH

	tristate



config SND_SOC_WCD9335

	tristate "WCD9335 Codec"

	depends on SLIMBUS

	select REGMAP_SLIMBUS

	select REGMAP_IRQ

	select SND_SOC_WCD_CLASSH

	help

	  The WCD9335 is a standalone Hi-Fi audio CODEC IC, supports

	  Qualcomm Technologies, Inc. (QTI) multimedia solutions,
@@ -1987,6 +1991,7 @@ config SND_SOC_WCD934X 
	depends on SLIMBUS

	select REGMAP_IRQ

	select REGMAP_SLIMBUS

	select SND_SOC_WCD_CLASSH

	select SND_SOC_WCD_MBHC

	depends on MFD_WCD934X || COMPILE_TEST

	help
@@ -1997,6 +2002,7 @@ config SND_SOC_WCD938X 
	depends on SND_SOC_WCD938X_SDW

	tristate

	depends on SOUNDWIRE || !SOUNDWIRE

	select SND_SOC_WCD_CLASSH



config SND_SOC_WCD938X_SDW

	tristate "WCD9380/WCD9385 Codec - SDW"

sound/soc/codecs/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -303,10 +303,11 @@ snd-soc-twl4030-objs := twl4030.o 
snd-soc-twl6040-objs := twl6040.o

snd-soc-uda1334-objs := uda1334.o

snd-soc-uda1380-objs := uda1380.o

snd-soc-wcd-classh-objs := wcd-clsh-v2.o

snd-soc-wcd-mbhc-objs := wcd-mbhc-v2.o

snd-soc-wcd9335-objs := wcd-clsh-v2.o wcd9335.o

snd-soc-wcd934x-objs := wcd-clsh-v2.o wcd934x.o

snd-soc-wcd938x-objs := wcd938x.o wcd-clsh-v2.o

snd-soc-wcd9335-objs := wcd9335.o

snd-soc-wcd934x-objs := wcd934x.o

snd-soc-wcd938x-objs := wcd938x.o

snd-soc-wcd938x-sdw-objs := wcd938x-sdw.o

snd-soc-wl1273-objs := wl1273.o

snd-soc-wm-adsp-objs := wm_adsp.o
@@ -685,6 +686,7 @@ obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o 
obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o

obj-$(CONFIG_SND_SOC_UDA1334)	+= snd-soc-uda1334.o

obj-$(CONFIG_SND_SOC_UDA1380)	+= snd-soc-uda1380.o

obj-$(CONFIG_SND_SOC_WCD_CLASSH)	+= snd-soc-wcd-classh.o

obj-$(CONFIG_SND_SOC_WCD_MBHC)	+= snd-soc-wcd-mbhc.o

obj-$(CONFIG_SND_SOC_WCD9335)	+= snd-soc-wcd9335.o

obj-$(CONFIG_SND_SOC_WCD934X)	+= snd-soc-wcd934x.o