Unverified Commit 67140b64 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.16' of... 

Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.17 so we can apply new Tegra work
parents f316c9d9 046aede2

Documentation/devicetree/bindings/sound/wlf,wm8962.yaml

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ properties: 
  clocks:

    maxItems: 1



  interrupts:

    maxItems: 1



  "#sound-dai-cells":

    const: 0

include/sound/soc-acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ struct snd_soc_acpi_link_adr { 
 */

/* Descriptor for SST ASoC machine driver */

struct snd_soc_acpi_mach {

	const u8 id[ACPI_ID_LEN];

	u8 id[ACPI_ID_LEN];

	const struct snd_soc_acpi_codecs *comp_ids;

	const u32 link_mask;

	const struct snd_soc_acpi_link_adr *links;

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

+2 −1
Original line number Diff line number Diff line
@@ -146,10 +146,11 @@ static int snd_acp6x_probe(struct pci_dev *pci, 
{

	struct acp6x_dev_data *adata;

	struct platform_device_info pdevinfo[ACP6x_DEVS];

	int ret, index;

	int index = 0;

	int val = 0x00;

	u32 addr;

	unsigned int irqflags;

	int ret;



	irqflags = IRQF_SHARED;

	/* Yellow Carp device check */

sound/soc/codecs/cs35l41-spi.c

+3 −29
Original line number Diff line number Diff line
@@ -26,34 +26,6 @@ static const struct spi_device_id cs35l41_id_spi[] = { 


MODULE_DEVICE_TABLE(spi, cs35l41_id_spi);



static void cs35l41_spi_otp_setup(struct cs35l41_private *cs35l41,

				  bool is_pre_setup, unsigned int *freq)

{

	struct spi_device *spi;

	u32 orig_spi_freq;



	spi = to_spi_device(cs35l41->dev);



	if (!spi) {

		dev_err(cs35l41->dev, "%s: No SPI device\n", __func__);

		return;

	}



	if (is_pre_setup) {

		orig_spi_freq = spi->max_speed_hz;

		if (orig_spi_freq > CS35L41_SPI_MAX_FREQ_OTP) {

			spi->max_speed_hz = CS35L41_SPI_MAX_FREQ_OTP;

			spi_setup(spi);

		}

		*freq = orig_spi_freq;

	} else {

		if (spi->max_speed_hz != *freq) {

			spi->max_speed_hz = *freq;

			spi_setup(spi);

		}

	}

}



static int cs35l41_spi_probe(struct spi_device *spi)

{

	const struct regmap_config *regmap_config = &cs35l41_regmap_spi;
@@ -65,6 +37,9 @@ static int cs35l41_spi_probe(struct spi_device *spi) 
	if (!cs35l41)

		return -ENOMEM;



	spi->max_speed_hz = CS35L41_SPI_MAX_FREQ;

	spi_setup(spi);



	spi_set_drvdata(spi, cs35l41);

	cs35l41->regmap = devm_regmap_init_spi(spi, regmap_config);

	if (IS_ERR(cs35l41->regmap)) {
@@ -75,7 +50,6 @@ static int cs35l41_spi_probe(struct spi_device *spi) 


	cs35l41->dev = &spi->dev;

	cs35l41->irq = spi->irq;

	cs35l41->otp_setup = cs35l41_spi_otp_setup;



	return cs35l41_probe(cs35l41, pdata);

}

sound/soc/codecs/cs35l41.c

+0 −7
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ static int cs35l41_otp_unpack(void *data) 
	const struct cs35l41_otp_packed_element_t *otp_map;

	struct cs35l41_private *cs35l41 = data;

	int bit_offset, word_offset, ret, i;

	unsigned int orig_spi_freq;

	unsigned int bit_sum = 8;

	u32 otp_val, otp_id_reg;

	u32 *otp_mem;
@@ -462,9 +461,6 @@ static int cs35l41_otp_unpack(void *data) 
		goto err_otp_unpack;

	}



	if (cs35l41->otp_setup)

		cs35l41->otp_setup(cs35l41, true, &orig_spi_freq);



	ret = regmap_bulk_read(cs35l41->regmap, CS35L41_OTP_MEM0, otp_mem,

			       CS35L41_OTP_SIZE_WORDS);

	if (ret < 0) {
@@ -472,9 +468,6 @@ static int cs35l41_otp_unpack(void *data) 
		goto err_otp_unpack;

	}



	if (cs35l41->otp_setup)

		cs35l41->otp_setup(cs35l41, false, &orig_spi_freq);



	otp_map = otp_map_match->map;



	bit_offset = otp_map_match->bit_offset;