Merge branch 'asoc-4.19' into asoc-4.20 for rt5682 deps.

[linux-block.git] / sound / soc / codecs / rt5682.c

diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index fad0bed82d79aafdc9b2869bbc05e85b132d751f..7213b1cfb18ac04088f42f125df1fc9490e84a27 100644 (file)
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -1432,6 +1432,28 @@ static const struct snd_kcontrol_new hpor_switch =
        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5682_HP_CTRL_1,
                                        RT5682_R_MUTE_SFT, 1, 1);
 
+static int rt5682_charge_pump_event(struct snd_soc_dapm_widget *w,
+       struct snd_kcontrol *kcontrol, int event)
+{
+       struct snd_soc_component *component =
+               snd_soc_dapm_to_component(w->dapm);
+
+       switch (event) {
+       case SND_SOC_DAPM_PRE_PMU:
+               snd_soc_component_update_bits(component,
+                       RT5682_HP_CHARGE_PUMP_1, RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
+               break;
+       case SND_SOC_DAPM_POST_PMD:
+               snd_soc_component_update_bits(component,
+                       RT5682_HP_CHARGE_PUMP_1, RT5682_PM_HP_MASK, RT5682_PM_HP_LV);
+               break;
+       default:
+               return 0;
+       }
+
+       return 0;
+}
+
 static int rt5682_hp_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
 {
@@ -1444,8 +1466,6 @@ static int rt5682_hp_event(struct snd_soc_dapm_widget *w,
                        RT5682_HP_LOGIC_CTRL_2, 0x0012);
                snd_soc_component_write(component,
                        RT5682_HP_CTRL_2, 0x6000);
-               snd_soc_component_update_bits(component, RT5682_STO_NG2_CTRL_1,
-                       RT5682_NG2_EN_MASK, RT5682_NG2_EN);
                snd_soc_component_update_bits(component,
                        RT5682_DEPOP_1, 0x60, 0x60);
                break;
@@ -1718,7 +1738,8 @@ static const struct snd_soc_dapm_widget rt5682_dapm_widgets[] = {
        SND_SOC_DAPM_SUPPLY("HP Amp R", RT5682_PWR_ANLG_1,
                RT5682_PWR_HA_R_BIT, 0, NULL, 0),
        SND_SOC_DAPM_SUPPLY_S("Charge Pump", 1, RT5682_DEPOP_1,
-               RT5682_PUMP_EN_SFT, 0, NULL, 0),
+               RT5682_PUMP_EN_SFT, 0, rt5682_charge_pump_event,
+               SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
        SND_SOC_DAPM_SUPPLY_S("Capless", 2, RT5682_DEPOP_1,
                RT5682_CAPLESS_EN_SFT, 0, NULL, 0),
 
@@ -1879,6 +1900,7 @@ static const struct snd_soc_dapm_route rt5682_dapm_routes[] = {
        {"HP Amp", NULL, "Charge Pump"},
        {"HP Amp", NULL, "CLKDET SYS"},
        {"HP Amp", NULL, "CBJ Power"},
+       {"HP Amp", NULL, "Vref1"},
        {"HP Amp", NULL, "Vref2"},
        {"HPOL Playback", "Switch", "HP Amp"},
        {"HPOR Playback", "Switch", "HP Amp"},
@@ -2449,27 +2471,15 @@ static void rt5682_calibrate(struct rt5682_priv *rt5682)
        regmap_write(rt5682->regmap, RT5682_PWR_ANLG_1, 0xa2bf);
        usleep_range(15000, 20000);
        regmap_write(rt5682->regmap, RT5682_PWR_ANLG_1, 0xf2bf);
-       regmap_write(rt5682->regmap, RT5682_MICBIAS_2, 0x0380);
-       regmap_write(rt5682->regmap, RT5682_PWR_DIG_1, 0x8001);
-       regmap_write(rt5682->regmap, RT5682_TEST_MODE_CTRL_1, 0x0000);
-       regmap_write(rt5682->regmap, RT5682_STO1_DAC_MIXER, 0x2080);
-       regmap_write(rt5682->regmap, RT5682_STO1_ADC_MIXER, 0x4040);
-       regmap_write(rt5682->regmap, RT5682_DEPOP_1, 0x0069);
+       regmap_write(rt5682->regmap, RT5682_MICBIAS_2, 0x0300);
+       regmap_write(rt5682->regmap, RT5682_GLB_CLK, 0x8000);
+       regmap_write(rt5682->regmap, RT5682_PWR_DIG_1, 0x0100);
        regmap_write(rt5682->regmap, RT5682_CHOP_DAC, 0x3000);
-       regmap_write(rt5682->regmap, RT5682_HP_CTRL_2, 0x6000);
-       regmap_write(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1, 0x0f26);
-       regmap_write(rt5682->regmap, RT5682_CALIB_ADC_CTRL, 0x7f05);
-       regmap_write(rt5682->regmap, RT5682_STO1_ADC_MIXER, 0x686c);
-       regmap_write(rt5682->regmap, RT5682_CAL_REC, 0x0d0d);
-       regmap_write(rt5682->regmap, RT5682_HP_CALIB_CTRL_9, 0x000f);
-       regmap_write(rt5682->regmap, RT5682_PWR_DIG_1, 0x8d01);
        regmap_write(rt5682->regmap, RT5682_HP_CALIB_CTRL_2, 0x0321);
        regmap_write(rt5682->regmap, RT5682_HP_LOGIC_CTRL_2, 0x0004);
        regmap_write(rt5682->regmap, RT5682_HP_CALIB_CTRL_1, 0x7c00);
        regmap_write(rt5682->regmap, RT5682_HP_CALIB_CTRL_3, 0x06a1);
-       regmap_write(rt5682->regmap, RT5682_A_DAC1_MUX, 0x0311);
-       regmap_write(rt5682->regmap, RT5682_RESET_HPF_CTRL, 0x0000);
-       regmap_write(rt5682->regmap, RT5682_ADC_STO1_HP_CTRL_1, 0x3320);
+       regmap_write(rt5682->regmap, RT5682_HP_CALIB_CTRL_1, 0x7c00);
 
        regmap_write(rt5682->regmap, RT5682_HP_CALIB_CTRL_1, 0xfc00);
 
@@ -2485,7 +2495,7 @@ static void rt5682_calibrate(struct rt5682_priv *rt5682)
                pr_err("HP Calibration Failure\n");
 
        /* restore settings */
-       regmap_write(rt5682->regmap, RT5682_STO1_ADC_MIXER, 0xc0c4);
+       regmap_write(rt5682->regmap, RT5682_GLB_CLK, 0x0000);
        regmap_write(rt5682->regmap, RT5682_PWR_DIG_1, 0x0000);
 
        mutex_unlock(&rt5682->calibrate_mutex);
@@ -2614,6 +2624,10 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
                        RT5682_GP4_PIN_MASK | RT5682_GP5_PIN_MASK,
                        RT5682_GP4_PIN_ADCDAT1 | RT5682_GP5_PIN_DACDAT1);
        regmap_write(rt5682->regmap, RT5682_TEST_MODE_CTRL_1, 0x0000);
+       regmap_update_bits(rt5682->regmap, RT5682_BIAS_CUR_CTRL_8,
+                       RT5682_HPA_CP_BIAS_CTRL_MASK, RT5682_HPA_CP_BIAS_3UA);
+       regmap_update_bits(rt5682->regmap, RT5682_CHARGE_PUMP_1,
+                       RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
 
        INIT_DELAYED_WORK(&rt5682->jack_detect_work,
                                rt5682_jack_detect_handler);