Unverified Commit 3c716e7f authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge fixes for consistent cs42l43 schema 

We have adjacent changes for the cs42l43 DT schema, merge the fixes
branch up so that there's a single thing for people to base future
changes on.
parents 4a221b2e 99d426c6

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: 14



  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

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);

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,8 @@ struct snd_soc_pcm_runtime { 
	unsigned int pop_wait:1;

	unsigned int fe_compr:1; /* for Dynamic PCM */



	bool initialized;



	int num_components;

	struct snd_soc_component *components[]; /* CPU/Codec/Platform */

};

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

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

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82YM"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {