diff options
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/sgtl5000.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/sgtl5000.h | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8978.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm8994.c | 4 |
4 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d441559dc92c..d659d3adcfb3 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c | |||
@@ -38,7 +38,7 @@ | |||
38 | static const struct reg_default sgtl5000_reg_defaults[] = { | 38 | static const struct reg_default sgtl5000_reg_defaults[] = { |
39 | { SGTL5000_CHIP_CLK_CTRL, 0x0008 }, | 39 | { SGTL5000_CHIP_CLK_CTRL, 0x0008 }, |
40 | { SGTL5000_CHIP_I2S_CTRL, 0x0010 }, | 40 | { SGTL5000_CHIP_I2S_CTRL, 0x0010 }, |
41 | { SGTL5000_CHIP_SSS_CTRL, 0x0008 }, | 41 | { SGTL5000_CHIP_SSS_CTRL, 0x0010 }, |
42 | { SGTL5000_CHIP_DAC_VOL, 0x3c3c }, | 42 | { SGTL5000_CHIP_DAC_VOL, 0x3c3c }, |
43 | { SGTL5000_CHIP_PAD_STRENGTH, 0x015f }, | 43 | { SGTL5000_CHIP_PAD_STRENGTH, 0x015f }, |
44 | { SGTL5000_CHIP_ANA_HP_CTRL, 0x1818 }, | 44 | { SGTL5000_CHIP_ANA_HP_CTRL, 0x1818 }, |
diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h index 4b69229a9818..2f8c88931f69 100644 --- a/sound/soc/codecs/sgtl5000.h +++ b/sound/soc/codecs/sgtl5000.h | |||
@@ -347,7 +347,7 @@ | |||
347 | #define SGTL5000_PLL_INT_DIV_MASK 0xf800 | 347 | #define SGTL5000_PLL_INT_DIV_MASK 0xf800 |
348 | #define SGTL5000_PLL_INT_DIV_SHIFT 11 | 348 | #define SGTL5000_PLL_INT_DIV_SHIFT 11 |
349 | #define SGTL5000_PLL_INT_DIV_WIDTH 5 | 349 | #define SGTL5000_PLL_INT_DIV_WIDTH 5 |
350 | #define SGTL5000_PLL_FRAC_DIV_MASK 0x0700 | 350 | #define SGTL5000_PLL_FRAC_DIV_MASK 0x07ff |
351 | #define SGTL5000_PLL_FRAC_DIV_SHIFT 0 | 351 | #define SGTL5000_PLL_FRAC_DIV_SHIFT 0 |
352 | #define SGTL5000_PLL_FRAC_DIV_WIDTH 11 | 352 | #define SGTL5000_PLL_FRAC_DIV_WIDTH 11 |
353 | 353 | ||
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 029f31c8e703..d8fc531c0e59 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
@@ -921,6 +921,7 @@ static struct snd_soc_dai_driver wm8978_dai = { | |||
921 | .formats = WM8978_FORMATS, | 921 | .formats = WM8978_FORMATS, |
922 | }, | 922 | }, |
923 | .ops = &wm8978_dai_ops, | 923 | .ops = &wm8978_dai_ops, |
924 | .symmetric_rates = 1, | ||
924 | }; | 925 | }; |
925 | 926 | ||
926 | static int wm8978_suspend(struct snd_soc_codec *codec) | 927 | static int wm8978_suspend(struct snd_soc_codec *codec) |
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 1d4b1ec66e36..ba832b77c543 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -3852,8 +3852,6 @@ static void wm8958_mic_work(struct work_struct *work) | |||
3852 | mic_complete_work.work); | 3852 | mic_complete_work.work); |
3853 | struct snd_soc_codec *codec = wm8994->hubs.codec; | 3853 | struct snd_soc_codec *codec = wm8994->hubs.codec; |
3854 | 3854 | ||
3855 | dev_crit(codec->dev, "MIC WORK %x\n", wm8994->mic_status); | ||
3856 | |||
3857 | pm_runtime_get_sync(codec->dev); | 3855 | pm_runtime_get_sync(codec->dev); |
3858 | 3856 | ||
3859 | mutex_lock(&wm8994->accdet_lock); | 3857 | mutex_lock(&wm8994->accdet_lock); |
@@ -3863,8 +3861,6 @@ static void wm8958_mic_work(struct work_struct *work) | |||
3863 | mutex_unlock(&wm8994->accdet_lock); | 3861 | mutex_unlock(&wm8994->accdet_lock); |
3864 | 3862 | ||
3865 | pm_runtime_put(codec->dev); | 3863 | pm_runtime_put(codec->dev); |
3866 | |||
3867 | dev_crit(codec->dev, "MIC WORK %x DONE\n", wm8994->mic_status); | ||
3868 | } | 3864 | } |
3869 | 3865 | ||
3870 | static irqreturn_t wm8958_mic_irq(int irq, void *data) | 3866 | static irqreturn_t wm8958_mic_irq(int irq, void *data) |