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

Merge tag 'asoc-fix-v5.12-rc2' of... 

Merge tag 'asoc-fix-v5.12-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.12

Quite a lot of mostly platform specific fixes here, the only one which
is generic is a fix for regressions on devices with more complex
clocking support with simple-card.  There's also a few new device IDs
and platform quirks.
parents 53b861be f9dc51cc

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

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ properties: 
      - fsl,vf610-spdif

      - fsl,imx6sx-spdif

      - fsl,imx8qm-spdif

      - fsl,imx8qxp-spdif

      - fsl,imx8mq-spdif

      - fsl,imx8mm-spdif

      - fsl,imx8mn-spdif



  reg:

    maxItems: 1

drivers/spi/spi-cadence-quadspi.c

+1 −0
Original line number Diff line number Diff line
@@ -1433,6 +1433,7 @@ static int cqspi_probe(struct platform_device *pdev) 
	cqspi = spi_master_get_devdata(master);



	cqspi->pdev = pdev;

	platform_set_drvdata(pdev, cqspi);



	/* Obtain configuration from OF. */

	ret = cqspi_of_get_pdata(cqspi);

sound/soc/codecs/Kconfig

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

	imply SND_SOC_SIMPLE_AMPLIFIER

	imply SND_SOC_SIMPLE_MUX

	imply SND_SOC_SIRF_AUDIO_CODEC

	imply SND_SOC_SPDIF

	imply SND_SOC_SSM2305

	imply SND_SOC_SSM2518
@@ -1279,10 +1278,6 @@ config SND_SOC_SIMPLE_MUX 
	tristate "Simple Audio Mux"

	select GPIOLIB



config SND_SOC_SIRF_AUDIO_CODEC

	tristate "SiRF SoC internal audio codec"

	select REGMAP_MMIO



config SND_SOC_SPDIF

	tristate "S/PDIF CODEC"

sound/soc/codecs/ak4458.c

+1 −0
Original line number Diff line number Diff line
@@ -812,6 +812,7 @@ static const struct of_device_id ak4458_of_match[] = { 
	{ .compatible = "asahi-kasei,ak4497", .data = &ak4497_drvdata},

	{ },

};

MODULE_DEVICE_TABLE(of, ak4458_of_match);



static struct i2c_driver ak4458_i2c_driver = {

	.driver = {

sound/soc/codecs/ak5558.c

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ static const struct of_device_id ak5558_i2c_dt_ids[] __maybe_unused = { 
	{ .compatible = "asahi-kasei,ak5558"},

	{ }

};

MODULE_DEVICE_TABLE(of, ak5558_i2c_dt_ids);



static struct i2c_driver ak5558_i2c_driver = {

	.driver = {