Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa983d9d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Factor out analogue platform data from WM8993 



This is also shared with newer CODECs.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 4c0bccbe

sound/soc/codecs/wm8993.c

+9 −27
Original line number Diff line number Diff line
@@ -1572,32 +1572,14 @@ static int wm8993_i2c_probe(struct i2c_client *i2c, 
	/* Use automatic clock configuration */

	snd_soc_update_bits(codec, WM8993_CLOCKING_4, WM8993_SR_MODE, 0);



	if (!wm8993->pdata.lineout1_diff)

		snd_soc_update_bits(codec, WM8993_LINE_MIXER1,

				    WM8993_LINEOUT1_MODE,

				    WM8993_LINEOUT1_MODE);

	if (!wm8993->pdata.lineout2_diff)

		snd_soc_update_bits(codec, WM8993_LINE_MIXER2,

				    WM8993_LINEOUT2_MODE,

				    WM8993_LINEOUT2_MODE);



	if (wm8993->pdata.lineout1fb)

		snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL,

				    WM8993_LINEOUT1_FB, WM8993_LINEOUT1_FB);



	if (wm8993->pdata.lineout2fb)

		snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL,

				    WM8993_LINEOUT2_FB, WM8993_LINEOUT2_FB);



	/* Apply the microphone bias/detection configuration - the

	 * platform data is directly applicable to the register. */

	snd_soc_update_bits(codec, WM8993_MICBIAS,

			    WM8993_JD_SCTHR_MASK | WM8993_JD_THR_MASK |

			    WM8993_MICB1_LVL | WM8993_MICB2_LVL,

			    wm8993->pdata.jd_scthr << WM8993_JD_SCTHR_SHIFT |

			    wm8993->pdata.jd_thr << WM8993_JD_THR_SHIFT |

			    wm8993->pdata.micbias1_lvl |

			    wm8993->pdata.micbias1_lvl << 1);

	wm_hubs_handle_analogue_pdata(codec, wm8993->pdata.lineout1_diff,

				      wm8993->pdata.lineout2_diff,

				      wm8993->pdata.lineout1fb,

				      wm8993->pdata.lineout2fb,

				      wm8993->pdata.jd_scthr,

				      wm8993->pdata.jd_thr,

				      wm8993->pdata.micbias1_lvl,

				      wm8993->pdata.micbias2_lvl);

			     

	ret = wm8993_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	if (ret != 0)

sound/soc/codecs/wm_hubs.c

+35 −0
Original line number Diff line number Diff line
@@ -738,6 +738,41 @@ int wm_hubs_add_analogue_routes(struct snd_soc_codec *codec, 
}

EXPORT_SYMBOL_GPL(wm_hubs_add_analogue_routes);



int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *codec,

				  int lineout1_diff, int lineout2_diff,

				  int lineout1fb, int lineout2fb,

				  int jd_scthr, int jd_thr, int micbias1_lvl,

				  int micbias2_lvl)

{

	if (!lineout1_diff)

		snd_soc_update_bits(codec, WM8993_LINE_MIXER1,

				    WM8993_LINEOUT1_MODE,

				    WM8993_LINEOUT1_MODE);

	if (!lineout2_diff)

		snd_soc_update_bits(codec, WM8993_LINE_MIXER2,

				    WM8993_LINEOUT2_MODE,

				    WM8993_LINEOUT2_MODE);



	if (lineout1fb)

		snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL,

				    WM8993_LINEOUT1_FB, WM8993_LINEOUT1_FB);



	if (lineout2fb)

		snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL,

				    WM8993_LINEOUT2_FB, WM8993_LINEOUT2_FB);



	snd_soc_update_bits(codec, WM8993_MICBIAS,

			    WM8993_JD_SCTHR_MASK | WM8993_JD_THR_MASK |

			    WM8993_MICB1_LVL | WM8993_MICB2_LVL,

			    jd_scthr << WM8993_JD_SCTHR_SHIFT |

			    jd_thr << WM8993_JD_THR_SHIFT |

			    micbias1_lvl |

			    micbias2_lvl << WM8993_MICB2_LVL_SHIFT);



	return 0;

}

EXPORT_SYMBOL_GPL(wm_hubs_handle_analogue_pdata);



MODULE_DESCRIPTION("Shared support for Wolfson hubs products");

MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");

MODULE_LICENSE("GPL");

sound/soc/codecs/wm_hubs.h

+5 −0
Original line number Diff line number Diff line
@@ -20,5 +20,10 @@ extern const unsigned int wm_hubs_spkmix_tlv[]; 


extern int wm_hubs_add_analogue_controls(struct snd_soc_codec *);

extern int wm_hubs_add_analogue_routes(struct snd_soc_codec *, int, int);

extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *,

					 int lineout1_diff, int lineout2_diff,

					 int lineout1fb, int lineout2fb,

					 int jd_scthr, int jd_thr,

					 int micbias1_lvl, int micbias2_lvl);



#endif