Commit 87543ce5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



For applying HD-audio EPROBE_DEFER series cleanly.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 2b17b489 8e13caa2

Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ properties: 
    description:

      Current at which the headset micbias sense clamp will engage, 0 to

      disable.

    enum: [ 0, 14, 23, 41, 50, 60, 68, 86, 95 ]

    enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ]

    default: 0



  cirrus,bias-ramp-ms:

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

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ properties: 
      - const: clkext3

    minItems: 2



  "#sound-dai-cells":

    const: 0



required:

  - compatible

  - reg

Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - const: rockchip,rk3568-spdif

      - items:

          - enum:

              - rockchip,rk3128-spdif

              - rockchip,rk3188-spdif

              - rockchip,rk3288-spdif

              - rockchip,rk3308-spdif

drivers/firmware/cirrus/cs_dsp.c

+17 −17
Original line number Diff line number Diff line
@@ -1863,7 +1863,7 @@ static int cs_dsp_adsp2_setup_algs(struct cs_dsp *dsp) 
		return PTR_ERR(adsp2_alg);



	for (i = 0; i < n_algs; i++) {

		cs_dsp_info(dsp,

		cs_dsp_dbg(dsp,

			   "%d: ID %x v%d.%d.%d XM@%x YM@%x ZM@%x\n",

			   i, be32_to_cpu(adsp2_alg[i].alg.id),

			   (be32_to_cpu(adsp2_alg[i].alg.ver) & 0xff0000) >> 16,
@@ -1996,7 +1996,7 @@ static int cs_dsp_halo_setup_algs(struct cs_dsp *dsp) 
		return PTR_ERR(halo_alg);



	for (i = 0; i < n_algs; i++) {

		cs_dsp_info(dsp,

		cs_dsp_dbg(dsp,

			   "%d: ID %x v%d.%d.%d XM@%x YM@%x\n",

			   i, be32_to_cpu(halo_alg[i].alg.id),

			   (be32_to_cpu(halo_alg[i].alg.ver) & 0xff0000) >> 16,

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card); 


int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream,

			    struct snd_pcm_hw_params *params, struct snd_soc_dai *dai);

int snd_soc_dapm_widget_name_cmp(struct snd_soc_dapm_widget *widget, const char *s);



/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_card *card);