ASoC: wm8996: Remove separate output stage enable step

[~andy/linux] / sound / soc / codecs / wm8996.c

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index fb5c07a9ec9cdc8c88ae9053945aa83cf72134da..40a124c9f15daa72caa589adf94002373176907c 100644 (file)
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -118,7 +118,6 @@ WM8996_REGULATOR_EVENT(1)
 WM8996_REGULATOR_EVENT(2)
 
 static struct reg_default wm8996_reg[] = {
-       { WM8996_SOFTWARE_RESET, 0x8996 },
        { WM8996_POWER_MANAGEMENT_1, 0x0 },
        { WM8996_POWER_MANAGEMENT_2, 0x0 },
        { WM8996_POWER_MANAGEMENT_3, 0x0 },
@@ -153,7 +152,6 @@ static struct reg_default wm8996_reg[] = {
        { WM8996_CHARGE_PUMP_1, 0x1f25 },
        { WM8996_CHARGE_PUMP_2, 0xab19 },
        { WM8996_DC_SERVO_1, 0x0 },
-       { WM8996_DC_SERVO_2, 0x0 },
        { WM8996_DC_SERVO_3, 0x0 },
        { WM8996_DC_SERVO_5, 0x2a2a },
        { WM8996_DC_SERVO_6, 0x0 },
@@ -892,8 +890,8 @@ static void wm8996_seq_notifier(struct snd_soc_dapm_context *dapm,
                val = 0;
                mask = 0;
                if (wm8996->hpout_pending & HPOUT1L) {
-                       val |= WM8996_HPOUT1L_RMV_SHORT;
-                       mask |= WM8996_HPOUT1L_RMV_SHORT;
+                       val |= WM8996_HPOUT1L_RMV_SHORT | WM8996_HPOUT1L_OUTP;
+                       mask |= WM8996_HPOUT1L_RMV_SHORT | WM8996_HPOUT1L_OUTP;
                } else {
                        mask |= WM8996_HPOUT1L_RMV_SHORT |
                                WM8996_HPOUT1L_OUTP |
@@ -901,8 +899,8 @@ static void wm8996_seq_notifier(struct snd_soc_dapm_context *dapm,
                }
 
                if (wm8996->hpout_pending & HPOUT1R) {
-                       val |= WM8996_HPOUT1R_RMV_SHORT;
-                       mask |= WM8996_HPOUT1R_RMV_SHORT;
+                       val |= WM8996_HPOUT1R_RMV_SHORT | WM8996_HPOUT1R_OUTP;
+                       mask |= WM8996_HPOUT1R_RMV_SHORT | WM8996_HPOUT1R_OUTP;
                } else {
                        mask |= WM8996_HPOUT1R_RMV_SHORT |
                                WM8996_HPOUT1R_OUTP |
@@ -914,8 +912,8 @@ static void wm8996_seq_notifier(struct snd_soc_dapm_context *dapm,
                val = 0;
                mask = 0;
                if (wm8996->hpout_pending & HPOUT2L) {
-                       val |= WM8996_HPOUT2L_RMV_SHORT;
-                       mask |= WM8996_HPOUT2L_RMV_SHORT;
+                       val |= WM8996_HPOUT2L_RMV_SHORT | WM8996_HPOUT2L_OUTP;
+                       mask |= WM8996_HPOUT2L_RMV_SHORT | WM8996_HPOUT2L_OUTP;
                } else {
                        mask |= WM8996_HPOUT2L_RMV_SHORT |
                                WM8996_HPOUT2L_OUTP |
@@ -923,8 +921,8 @@ static void wm8996_seq_notifier(struct snd_soc_dapm_context *dapm,
                }
 
                if (wm8996->hpout_pending & HPOUT2R) {
-                       val |= WM8996_HPOUT2R_RMV_SHORT;
-                       mask |= WM8996_HPOUT2R_RMV_SHORT;
+                       val |= WM8996_HPOUT2R_RMV_SHORT | WM8996_HPOUT2R_OUTP;
+                       mask |= WM8996_HPOUT2R_RMV_SHORT | WM8996_HPOUT2R_OUTP;
                } else {
                        mask |= WM8996_HPOUT2R_RMV_SHORT |
                                WM8996_HPOUT2R_OUTP |
@@ -1216,7 +1214,6 @@ SND_SOC_DAPM_PGA_S("HPOUT2L PGA", 0, WM8996_POWER_MANAGEMENT_1, 7, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT2L_DLY", 1, WM8996_ANALOGUE_HP_2, 5, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT2L_DCS", 2, WM8996_DC_SERVO_1, 2, 0, dcs_start,
                   SND_SOC_DAPM_POST_PMU),
-SND_SOC_DAPM_PGA_S("HPOUT2L_OUTP", 3, WM8996_ANALOGUE_HP_2, 6, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT2L_RMV_SHORT", 3, SND_SOC_NOPM, HPOUT2L, 0,
                   rmv_short_event,
                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -1225,7 +1222,6 @@ SND_SOC_DAPM_PGA_S("HPOUT2R PGA", 0, WM8996_POWER_MANAGEMENT_1, 6, 0,NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT2R_DLY", 1, WM8996_ANALOGUE_HP_2, 1, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT2R_DCS", 2, WM8996_DC_SERVO_1, 3, 0, dcs_start,
                   SND_SOC_DAPM_POST_PMU),
-SND_SOC_DAPM_PGA_S("HPOUT2R_OUTP", 3, WM8996_ANALOGUE_HP_2, 2, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT2R_RMV_SHORT", 3, SND_SOC_NOPM, HPOUT2R, 0,
                   rmv_short_event,
                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -1234,7 +1230,6 @@ SND_SOC_DAPM_PGA_S("HPOUT1L PGA", 0, WM8996_POWER_MANAGEMENT_1, 5, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT1L_DLY", 1, WM8996_ANALOGUE_HP_1, 5, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT1L_DCS", 2, WM8996_DC_SERVO_1, 0, 0, dcs_start,
                   SND_SOC_DAPM_POST_PMU),
-SND_SOC_DAPM_PGA_S("HPOUT1L_OUTP", 3, WM8996_ANALOGUE_HP_1, 6, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT1L_RMV_SHORT", 3, SND_SOC_NOPM, HPOUT1L, 0,
                   rmv_short_event,
                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -1243,7 +1238,6 @@ SND_SOC_DAPM_PGA_S("HPOUT1R PGA", 0, WM8996_POWER_MANAGEMENT_1, 4, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT1R_DLY", 1, WM8996_ANALOGUE_HP_1, 1, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT1R_DCS", 2, WM8996_DC_SERVO_1, 1, 0, dcs_start,
                   SND_SOC_DAPM_POST_PMU),
-SND_SOC_DAPM_PGA_S("HPOUT1R_OUTP", 3, WM8996_ANALOGUE_HP_1, 2, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("HPOUT1R_RMV_SHORT", 3, SND_SOC_NOPM, HPOUT1R, 0,
                   rmv_short_event,
                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -1436,32 +1430,28 @@ static const struct snd_soc_dapm_route wm8996_dapm_routes[] = {
        { "HPOUT2L PGA", NULL, "DAC2L" },
        { "HPOUT2L_DLY", NULL, "HPOUT2L PGA" },
        { "HPOUT2L_DCS", NULL, "HPOUT2L_DLY" },
-       { "HPOUT2L_OUTP", NULL, "HPOUT2L_DCS" },
-       { "HPOUT2L_RMV_SHORT", NULL, "HPOUT2L_OUTP" },
+       { "HPOUT2L_RMV_SHORT", NULL, "HPOUT2L_DCS" },
 
        { "HPOUT2R PGA", NULL, "Charge Pump" },
        { "HPOUT2R PGA", NULL, "Bandgap" },
        { "HPOUT2R PGA", NULL, "DAC2R" },
        { "HPOUT2R_DLY", NULL, "HPOUT2R PGA" },
        { "HPOUT2R_DCS", NULL, "HPOUT2R_DLY" },
-       { "HPOUT2R_OUTP", NULL, "HPOUT2R_DCS" },
-       { "HPOUT2R_RMV_SHORT", NULL, "HPOUT2R_OUTP" },
+       { "HPOUT2R_RMV_SHORT", NULL, "HPOUT2R_DCS" },
 
        { "HPOUT1L PGA", NULL, "Charge Pump" },
        { "HPOUT1L PGA", NULL, "Bandgap" },
        { "HPOUT1L PGA", NULL, "DAC1L" },
        { "HPOUT1L_DLY", NULL, "HPOUT1L PGA" },
        { "HPOUT1L_DCS", NULL, "HPOUT1L_DLY" },
-       { "HPOUT1L_OUTP", NULL, "HPOUT1L_DCS" },
-       { "HPOUT1L_RMV_SHORT", NULL, "HPOUT1L_OUTP" },
+       { "HPOUT1L_RMV_SHORT", NULL, "HPOUT1L_DCS" },
 
        { "HPOUT1R PGA", NULL, "Charge Pump" },
        { "HPOUT1R PGA", NULL, "Bandgap" },
        { "HPOUT1R PGA", NULL, "DAC1R" },
        { "HPOUT1R_DLY", NULL, "HPOUT1R PGA" },
        { "HPOUT1R_DCS", NULL, "HPOUT1R_DLY" },
-       { "HPOUT1R_OUTP", NULL, "HPOUT1R_DCS" },
-       { "HPOUT1R_RMV_SHORT", NULL, "HPOUT1R_OUTP" },
+       { "HPOUT1R_RMV_SHORT", NULL, "HPOUT1R_DCS" },
 
        { "HPOUT2L", NULL, "HPOUT2L_RMV_SHORT" },
        { "HPOUT2R", NULL, "HPOUT2R_RMV_SHORT" },
@@ -1719,8 +1709,8 @@ static bool wm8996_volatile_register(struct device *dev, unsigned int reg)
 static int wm8996_reset(struct wm8996_priv *wm8996)
 {
        if (wm8996->pdata.ldo_ena > 0) {
-               gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 1);
                gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0);
+               gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 1);
                return 0;
        } else {
                return regmap_write(wm8996->regmap, WM8996_SOFTWARE_RESET,
@@ -3054,12 +3044,6 @@ static int wm8996_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static int wm8996_soc_volatile_register(struct snd_soc_codec *codec,
-                                       unsigned int reg)
-{
-       return true;
-}
-
 static struct snd_soc_codec_driver soc_codec_dev_wm8996 = {
        .probe =        wm8996_probe,
        .remove =       wm8996_remove,
@@ -3073,8 +3057,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8996 = {
        .dapm_routes = wm8996_dapm_routes,
        .num_dapm_routes = ARRAY_SIZE(wm8996_dapm_routes),
        .set_pll = wm8996_set_fll,
-       .reg_cache_size = WM8996_MAX_REGISTER,
-       .volatile_register = wm8996_soc_volatile_register,
 };
 
 #define WM8996_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\