Unverified Commit 5c5bb9a2 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/max98095',... 

Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/max98357a', 'asoc/topic/max98371' and 'asoc/topic/max98373' into asoc-next
parents 8d8084d8 b50c32bd 2dd1637f 4b51e9f1 1ae91ac7 41572b54

Documentation/devicetree/bindings/sound/max98090.txt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ Optional properties: 


- clock-names: Should be "mclk"



- #sound-dai-cells : should be 0.



- maxim,dmic-freq: Frequency at which to clock DMIC



- maxim,micbias: Micbias voltage applies to the analog mic, valid voltages value are:

sound/soc/codecs/max98090.c

+160 −159

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/max98090.h

+2 −2
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ struct max98090_cdata { 


struct max98090_priv {

	struct regmap *regmap;

	struct snd_soc_codec *codec;

	struct snd_soc_component *component;

	enum max98090_type devtype;

	struct max98090_pdata *pdata;

	struct clk *mclk;
@@ -1546,7 +1546,7 @@ struct max98090_priv { 
	bool shdn_pending;

};



int max98090_mic_detect(struct snd_soc_codec *codec,

int max98090_mic_detect(struct snd_soc_component *component,

	struct snd_soc_jack *jack);



#endif

sound/soc/codecs/max98095.c

+221 −227

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/max98095.h

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ 
/* Default Delay used in Slew Rate Calculation for Jack detection */

#define M98095_DEFAULT_SLEW_DELAY		0x18



extern int max98095_jack_detect(struct snd_soc_codec *codec,

extern int max98095_jack_detect(struct snd_soc_component *component,

	struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack);



#endif