| Message ID | 20170726003512.18965-5-srinivas.kandagatla@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: codecs: msm8916-wcd-analog: Add support to MBHC | expand |
On Wed, Jul 26, 2017 at 02:35:10AM +0200, srinivas.kandagatla@linaro.org wrote: > From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > This patch sets the default internal micbias voltage to 1.8v. This > default value is required for mbhc buttons to work. Also adds dt > bindings to allow the board level file to specify the required default > micbias value. What was the default previously?
On 28/07/17 14:40, Mark Brown wrote: > On Wed, Jul 26, 2017 at 02:35:10AM +0200, srinivas.kandagatla@linaro.org wrote: >> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> >> This patch sets the default internal micbias voltage to 1.8v. This >> default value is required for mbhc buttons to work. Also adds dt >> bindings to allow the board level file to specify the required default >> micbias value. > > What was the default previously? > This was set to 2.7v previously for special headsets which have high impedance.
On Fri, Jul 28, 2017 at 03:45:08PM +0100, Srinivas Kandagatla wrote: > On 28/07/17 15:01, Mark Brown wrote: > > On Fri, Jul 28, 2017 at 02:54:59PM +0100, Srinivas Kandagatla wrote: > > > This was set to 2.7v previously for special headsets which have high > > > impedance. > > So obviously this will break existing users. That's not OK. > This would not break any exiting users, as this part is applicable for only > headset detect usecase. I will try to address this in ("PATCH 5/6 ASoC: > codecs: msm8916-wcd-analog: add MBHC support") patch. > The default voltage for most common usecase should be set to 1.8v anyway. Just leave it at the hardware default like we do for everything else in ASoC.
On 31/07/17 11:07, Mark Brown wrote: > On Fri, Jul 28, 2017 at 03:45:08PM +0100, Srinivas Kandagatla wrote: >> On 28/07/17 15:01, Mark Brown wrote: >>> On Fri, Jul 28, 2017 at 02:54:59PM +0100, Srinivas Kandagatla wrote: > >>>> This was set to 2.7v previously for special headsets which have high >>>> impedance. > >>> So obviously this will break existing users. That's not OK. > >> This would not break any exiting users, as this part is applicable for only >> headset detect usecase. I will try to address this in ("PATCH 5/6 ASoC: >> codecs: msm8916-wcd-analog: add MBHC support") patch. > >> The default voltage for most common usecase should be set to 1.8v anyway. > > Just leave it at the hardware default like we do for everything else in > ASoC. Yep, makes sense, the hw default is at 1.8v. thanks, srini >
diff --git a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt index ccb401c..05b67a1 100644 --- a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt +++ b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt @@ -33,6 +33,7 @@ Required properties - vdd-micbias-supply: phandle of VDD_MICBIAS supply's regulator DT node. Optional Properties: +- qcom,micbias-lvl: Voltage (mV) for Mic Bias - qcom,micbias1-ext-cap: boolean, present if micbias1 has external capacitor connected. - qcom,micbias2-ext-cap: boolean, present if micbias2 has external capacitor diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index 6606954..69df0ee 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -93,8 +93,13 @@ #define MICB_1_EN_TX3_GND_SEL_TX_GND 0 #define CDC_A_MICB_1_VAL (0xf141) +#define MICB_DEFAULT_VAL 1800 +#define MICB_MIN_VAL 1600 +#define MICB_STEP_SIZE 50 +#define MICB_VOLTAGE_REGVAL(v) ((v - MICB_MIN_VAL)/MICB_STEP_SIZE) #define MICB_1_VAL_MICB_OUT_VAL_MASK GENMASK(7, 3) #define MICB_1_VAL_MICB_OUT_VAL_V2P70V ((0x16) << 3) +#define MICB_1_VAL_MICB_OUT_VAL_V1P80V ((0x4) << 3) #define CDC_A_MICB_1_CTL (0xf142) #define MICB_1_CTL_CFILT_REF_SEL_MASK BIT(1) @@ -225,6 +230,7 @@ struct pm8916_wcd_analog_priv { struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; unsigned int micbias1_cap_mode; unsigned int micbias2_cap_mode; + unsigned int micbias_mv; }; static const char *const adc2_mux_text[] = { "ZERO", "INP2", "INP3" }; @@ -265,18 +271,16 @@ static const struct snd_kcontrol_new pm8916_wcd_analog_snd_controls[] = { static void pm8916_wcd_analog_micbias_enable(struct snd_soc_codec *codec) { + struct pm8916_wcd_analog_priv *wcd = snd_soc_codec_get_drvdata(codec); + snd_soc_update_bits(codec, CDC_A_MICB_1_CTL, MICB_1_CTL_EXT_PRECHARG_EN_MASK | MICB_1_CTL_INT_PRECHARG_BYP_MASK, MICB_1_CTL_INT_PRECHARG_BYP_EXT_PRECHRG_SEL | MICB_1_CTL_EXT_PRECHARG_EN_ENABLE); - snd_soc_write(codec, CDC_A_MICB_1_VAL, MICB_1_VAL_MICB_OUT_VAL_V2P70V); - /* - * Special headset needs MICBIAS as 2.7V so wait for - * 50 msec for the MICBIAS to reach 2.7 volts. - */ - msleep(50); + snd_soc_write(codec, CDC_A_MICB_1_VAL, + MICB_VOLTAGE_REGVAL(wcd->micbias_mv)); snd_soc_update_bits(codec, CDC_A_MICB_1_CTL, MICB_1_CTL_EXT_PRECHARG_EN_MASK | MICB_1_CTL_INT_PRECHARG_BYP_MASK, 0); @@ -795,6 +799,10 @@ static int pm8916_wcd_analog_parse_dt(struct device *dev, else priv->micbias2_cap_mode = MICB_1_EN_NO_EXT_BYP_CAP; + if (of_property_read_u32(dev->of_node, "qcom,micbias-lvl", + &priv->micbias_mv)) + priv->micbias_mv = MICB_DEFAULT_VAL; + return 0; }