Commit 25fca8c9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.15-rc1' of... 

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

ASoC: Fixes for v5.15

A collection of fixes that came in during the merge window, nothing too
remarkable but a reasonably large number of fixes.
parents c5433f02 fcb958ee

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - fsl,imx8mn-rpmsg-audio

      - fsl,imx8mn-rpmsg-audio

      - fsl,imx8mm-rpmsg-audio

      - fsl,imx8mm-rpmsg-audio

      - fsl,imx8mp-rpmsg-audio

      - fsl,imx8mp-rpmsg-audio

      - fsl,imx8ulp-rpmsg-audio





  model:

  model:

    $ref: /schemas/types.yaml#/definitions/string

    $ref: /schemas/types.yaml#/definitions/string

Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml

+19 −21
Original line number Original line Diff line number Diff line
@@ -130,36 +130,34 @@ additionalProperties: false 




examples:

examples:

  - |

  - |

    #include <dt-bindings/clock/mt8195-clk.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/power/mt8195-power.h>





    afe: mt8195-afe-pcm@10890000 {

    afe: mt8195-afe-pcm@10890000 {

        compatible = "mediatek,mt8195-audio";

        compatible = "mediatek,mt8195-audio";

        reg = <0x10890000 0x10000>;

        reg = <0x10890000 0x10000>;

        interrupts = <GIC_SPI 822 IRQ_TYPE_LEVEL_HIGH 0>;

        interrupts = <GIC_SPI 822 IRQ_TYPE_LEVEL_HIGH 0>;

        mediatek,topckgen = <&topckgen>;

        mediatek,topckgen = <&topckgen>;

        power-domains = <&spm MT8195_POWER_DOMAIN_AUDIO>;

        power-domains = <&spm 7>; //MT8195_POWER_DOMAIN_AUDIO

        clocks = <&clk26m>,

        clocks = <&clk26m>,

                 <&topckgen CLK_TOP_APLL1>,

                 <&topckgen 163>, //CLK_TOP_APLL1

                 <&topckgen CLK_TOP_APLL2>,

                 <&topckgen 166>, //CLK_TOP_APLL2

                 <&topckgen CLK_TOP_APLL12_DIV0>,

                 <&topckgen 233>, //CLK_TOP_APLL12_DIV0

                 <&topckgen CLK_TOP_APLL12_DIV1>,

                 <&topckgen 234>, //CLK_TOP_APLL12_DIV1

                 <&topckgen CLK_TOP_APLL12_DIV2>,

                 <&topckgen 235>, //CLK_TOP_APLL12_DIV2

                 <&topckgen CLK_TOP_APLL12_DIV3>,

                 <&topckgen 236>, //CLK_TOP_APLL12_DIV3

                 <&topckgen CLK_TOP_APLL12_DIV9>,

                 <&topckgen 238>, //CLK_TOP_APLL12_DIV9

                 <&topckgen CLK_TOP_A1SYS_HP_SEL>,

                 <&topckgen 100>, //CLK_TOP_A1SYS_HP_SEL

                 <&topckgen CLK_TOP_AUD_INTBUS_SEL>,

                 <&topckgen 33>, //CLK_TOP_AUD_INTBUS_SEL

                 <&topckgen CLK_TOP_AUDIO_H_SEL>,

                 <&topckgen 34>, //CLK_TOP_AUDIO_H_SEL

                 <&topckgen CLK_TOP_AUDIO_LOCAL_BUS_SEL>,

                 <&topckgen 107>, //CLK_TOP_AUDIO_LOCAL_BUS_SEL

                 <&topckgen CLK_TOP_DPTX_M_SEL>,

                 <&topckgen 98>, //CLK_TOP_DPTX_M_SEL

                 <&topckgen CLK_TOP_I2SO1_M_SEL>,

                 <&topckgen 94>, //CLK_TOP_I2SO1_M_SEL

                 <&topckgen CLK_TOP_I2SO2_M_SEL>,

                 <&topckgen 95>, //CLK_TOP_I2SO2_M_SEL

                 <&topckgen CLK_TOP_I2SI1_M_SEL>,

                 <&topckgen 96>, //CLK_TOP_I2SI1_M_SEL

                 <&topckgen CLK_TOP_I2SI2_M_SEL>,

                 <&topckgen 97>, //CLK_TOP_I2SI2_M_SEL

                 <&infracfg_ao CLK_INFRA_AO_AUDIO_26M_B>,

                 <&infracfg_ao 50>, //CLK_INFRA_AO_AUDIO_26M_B

                 <&scp_adsp CLK_SCP_ADSP_AUDIODSP>;

                 <&scp_adsp 0>; //CLK_SCP_ADSP_AUDIODSP

        clock-names = "clk26m",

        clock-names = "clk26m",

                      "apll1_ck",

                      "apll1_ck",

                      "apll2_ck",

                      "apll2_ck",

sound/soc/codecs/rt5682.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -2942,9 +2942,6 @@ static int rt5682_suspend(struct snd_soc_component *component) 
			break;

			break;

		}

		}





		snd_soc_component_update_bits(component, RT5682_PWR_ANLG_3,

			RT5682_PWR_CBJ, 0);



		/* enter SAR ADC power saving mode */

		/* enter SAR ADC power saving mode */

		snd_soc_component_update_bits(component, RT5682_SAR_IL_CMD_1,

		snd_soc_component_update_bits(component, RT5682_SAR_IL_CMD_1,

			RT5682_SAR_BUTT_DET_MASK | RT5682_SAR_BUTDET_MODE_MASK |

			RT5682_SAR_BUTT_DET_MASK | RT5682_SAR_BUTDET_MODE_MASK |

sound/soc/generic/audio-graph-card.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -285,6 +285,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, 
	if (li->cpu) {

	if (li->cpu) {

		struct snd_soc_card *card = simple_priv_to_card(priv);

		struct snd_soc_card *card = simple_priv_to_card(priv);

		struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0);

		struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0);

		struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0);

		int is_single_links = 0;

		int is_single_links = 0;





		/* Codec is dummy */

		/* Codec is dummy */
@@ -313,6 +314,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, 
			dai_link->no_pcm = 1;

			dai_link->no_pcm = 1;





		asoc_simple_canonicalize_cpu(cpus, is_single_links);

		asoc_simple_canonicalize_cpu(cpus, is_single_links);

		asoc_simple_canonicalize_platform(platforms, cpus);

	} else {

	} else {

		struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, 0);

		struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, 0);

		struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0);

		struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0);
@@ -366,6 +368,7 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv, 
	struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);

	struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);

	struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0);

	struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0);

	struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0);

	struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0);

	struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0);

	char dai_name[64];

	char dai_name[64];

	int ret, is_single_links = 0;

	int ret, is_single_links = 0;
@@ -383,6 +386,7 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv, 
		 "%s-%s", cpus->dai_name, codecs->dai_name);

		 "%s-%s", cpus->dai_name, codecs->dai_name);





	asoc_simple_canonicalize_cpu(cpus, is_single_links);

	asoc_simple_canonicalize_cpu(cpus, is_single_links);

	asoc_simple_canonicalize_platform(platforms, cpus);





	ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name);

	ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name);

	if (ret < 0)

	if (ret < 0)
@@ -608,6 +612,7 @@ static int graph_count_noml(struct asoc_simple_priv *priv, 




	li->num[li->link].cpus		= 1;

	li->num[li->link].cpus		= 1;

	li->num[li->link].codecs	= 1;

	li->num[li->link].codecs	= 1;

	li->num[li->link].platforms     = 1;





	li->link += 1; /* 1xCPU-Codec */

	li->link += 1; /* 1xCPU-Codec */
@@ -630,6 +635,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, 




	if (li->cpu) {

	if (li->cpu) {

		li->num[li->link].cpus		= 1;

		li->num[li->link].cpus		= 1;

		li->num[li->link].platforms     = 1;





		li->link++; /* 1xCPU-dummy */

		li->link++; /* 1xCPU-dummy */

	} else {

	} else {

sound/soc/intel/boards/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -602,7 +602,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	select SND_SOC_DMIC

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	select SND_SOC_SDW_MOCKUP

	imply SND_SOC_SDW_MOCKUP

	help

	help

	  Add support for Intel SoundWire-based platforms connected to

	  Add support for Intel SoundWire-based platforms connected to

	  MAX98373, RT700, RT711, RT1308 and RT715

	  MAX98373, RT700, RT711, RT1308 and RT715