ASoC: wm2200: Provide platform data for MICBIAS configuration
Subsystems (3)
PATCH 1/1 ASoC: wm2200: Provide platform data for MICBIAS configuration
Signed-off-by Chris Rattray <[email protected]>
--- include/sound/wm2200.h | 22 +++++++++++++++++++++- sound/soc/codecs/wm2200.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletions(-)
include/sound/wm2200.h +21 -1
@@ -12,6 +12,7 @@#define __LINUX_SND_WM2200_H#define WM2200_GPIO_SET 0x10000 +#define WM2200_MAX_MICBIAS 2enum wm2200_in_mode {WM2200_IN_SE =0 ,
@@ -25,6 +26,24 @@ enum wm2200_dmic_sup { WM2200_DMIC_SUP_MICBIAS2 = 2, }; +enum wm2200_mbias_lvl { +WM2200_MBIAS_LVL_1V5 =0 , +WM2200_MBIAS_LVL_1V8 =1 , +WM2200_MBIAS_LVL_1V9 =2 , +WM2200_MBIAS_LVL_2V0 =3 , +WM2200_MBIAS_LVL_2V2 =4 , +WM2200_MBIAS_LVL_2V4 =5 , +WM2200_MBIAS_LVL_2V5 =6 , +WM2200_MBIAS_LVL_2V6 =7 , +}; + +struct wm2200_micbias { +enum wm2200_mbias_lvl mb_lvl;/** Regulated voltage */ +unsigned int discharge:1 ;/** Actively discharge */ +unsigned int fast_start:1 ;/** Enable aggressive startup ramp rate */ +unsigned int bypass:1 ;/** Use bypass mode */ +}; +struct wm2200_pdata {int reset;/** GPIO controlling /RESET, if any */ int ldo_ena;/** GPIO controlling LODENA, if any */
@@ -35,7 +54,8 @@ struct wm2200_pdata {enum wm2200_in_mode in_mode[3 ];enum wm2200_dmic_sup dmic_sup[3 ]; - int micbias_cfg[2]; /** Register value to configure MICBIAS */ +/** MICBIAS configurations */ + struct wm2200_micbias micbias[WM2200_MAX_MICBIAS]; };#endif
sound/soc/codecs/wm2200.c +31 -0
@@ -2192,6 +2192,7 @@ static int wm2200_i2c_probe(struct i2c_client *i2c,struct wm2200_priv *wm2200;unsigned int reg;int ret, i; +int val; wm2200 =devm_kzalloc (&i2c->dev,sizeof (struct wm2200_priv ),GFP_KERNEL );
@@ -2342,6 +2343,36 @@ static int wm2200_i2c_probe(struct i2c_client *i2c,regmap_write (wm2200->regmap,WM2200_AUDIO_IF_1_16 + i, i); } +for (i =0 ; i <WM2200_MAX_MICBIAS ; i++) { +if (!wm2200->pdata.micbias[i].mb_lvl && + !wm2200->pdata.micbias[i].bypass) +continue ; + +/* Apply default for bypass mode */ +if (!wm2200->pdata.micbias[i].mb_lvl) + wm2200->pdata.micbias[i].mb_lvl + =WM2200_MBIAS_LVL_1V5 ; + + val = wm2200->pdata.micbias[i].mb_lvl + <<WM2200_MICB1_LVL_SHIFT ; + +if (wm2200->pdata.micbias[i].discharge) + val |=WM2200_MICB1_DISCH ; + +if (wm2200->pdata.micbias[i].fast_start) + val |=WM2200_MICB1_RATE ; + +if (wm2200->pdata.micbias[i].bypass) + val |=WM2200_MICB1_MODE ; + +regmap_update_bits (wm2200->regmap, +WM2200_MIC_BIAS_CTRL_1 + i, +WM2200_MICB1_LVL_MASK | +WM2200_MICB1_DISCH | +WM2200_MICB1_MODE | +WM2200_MICB1_RATE , val); + } +for (i =0 ; i <ARRAY_SIZE (wm2200->pdata.in_mode); i++) { regmap_update_bits(wm2200->regmap, wm2200_mic_ctrl_reg[i], WM2200_IN1_MODE_MASK |
Signature · 1 line
1.7.2.5
include/sound/wm2200.h enum wm2200_dmic_sup { · line 38
Quoted 10 lines · Chris Rattray
include/sound/wm2200.h +10
-0+enum wm2200_mbias_lvl { +WM2200_MBIAS_LVL_1V5 =0 , +WM2200_MBIAS_LVL_1V8 =1 , +WM2200_MBIAS_LVL_1V9 =2 , +WM2200_MBIAS_LVL_2V0 =3 , +WM2200_MBIAS_LVL_2V2 =4 , +WM2200_MBIAS_LVL_2V4 =5 , +WM2200_MBIAS_LVL_2V5 =6 , +WM2200_MBIAS_LVL_2V6 =7 , +};
It would be better to specify this in terms of milivolts; this means that if the user does not specify anything then we'll use the chip default which should be sane and is generally the expected behaviour.