Unverified Commit e0afd7d3 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up fixes 

Merge the for-6.14 to resolve conflicts with simple-card-utils.c due to
parallel delveopment.
parents f0066c8d de74ec71

include/sound/soc.h

+4 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,10 @@ void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd); 


/* mixer control */

struct soc_mixer_control {

	int min, max, platform_max;

	/* Minimum and maximum specified as written to the hardware */

	int min, max;

	/* Limited maximum value specified as presented through the control */

	int platform_max;

	int reg, rreg;

	unsigned int shift, rshift;

	u32 num_channels;

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

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

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21M6"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/cs42l43.c

+1 −1
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ static const struct snd_kcontrol_new cs42l43_controls[] = { 


	SOC_DOUBLE_R_SX_TLV("ADC Volume", CS42L43_ADC_B_CTRL1, CS42L43_ADC_B_CTRL2,

			    CS42L43_ADC_PGA_GAIN_SHIFT,

			    0xF, 5, cs42l43_adc_tlv),

			    0xF, 4, cs42l43_adc_tlv),



	SOC_DOUBLE("PDM1 Invert Switch", CS42L43_DMIC_PDM_CTRL,

		   CS42L43_PDM1L_INV_SHIFT, CS42L43_PDM1R_INV_SHIFT, 1, 0),

sound/soc/codecs/rt722-sdca-sdw.c

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg) 
	case 0x6100067:

	case 0x6100070 ... 0x610007c:

	case 0x6100080:

	case SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT722_SDCA_ENT_FU15, RT722_SDCA_CTL_FU_CH_GAIN,

			  CH_01) ...

	     SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT722_SDCA_ENT_FU15, RT722_SDCA_CTL_FU_CH_GAIN,

			  CH_04):

	case SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT722_SDCA_ENT_USER_FU1E, RT722_SDCA_CTL_FU_VOLUME,

			CH_01):

	case SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT722_SDCA_ENT_USER_FU1E, RT722_SDCA_CTL_FU_VOLUME,

sound/soc/codecs/wm0010.c

+11 −2
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ static int wm0010_spi_probe(struct spi_device *spi) 
	if (ret) {

		dev_err(wm0010->dev, "Failed to set IRQ %d as wake source: %d\n",

			irq, ret);

		return ret;

		goto free_irq;

	}



	if (spi->max_speed_hz)
@@ -932,9 +932,18 @@ static int wm0010_spi_probe(struct spi_device *spi) 
				     &soc_component_dev_wm0010, wm0010_dai,

				     ARRAY_SIZE(wm0010_dai));

	if (ret < 0)

		return ret;

		goto disable_irq_wake;



	return 0;



disable_irq_wake:

	irq_set_irq_wake(wm0010->irq, 0);



free_irq:

	if (wm0010->irq)

		free_irq(wm0010->irq, wm0010);



	return ret;

}



static void wm0010_spi_remove(struct spi_device *spi)