diff options
Diffstat (limited to 'sound/soc/codecs/wm8988.c')
-rw-r--r-- | sound/soc/codecs/wm8988.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index d7f259711970..d7170f1381aa 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <sound/pcm_params.h> | 25 | #include <sound/pcm_params.h> |
26 | #include <sound/tlv.h> | 26 | #include <sound/tlv.h> |
27 | #include <sound/soc.h> | 27 | #include <sound/soc.h> |
28 | #include <sound/soc-dapm.h> | ||
29 | #include <sound/initval.h> | 28 | #include <sound/initval.h> |
30 | 29 | ||
31 | #include "wm8988.h" | 30 | #include "wm8988.h" |
@@ -54,7 +53,6 @@ struct wm8988_priv { | |||
54 | unsigned int sysclk; | 53 | unsigned int sysclk; |
55 | enum snd_soc_control_type control_type; | 54 | enum snd_soc_control_type control_type; |
56 | struct snd_pcm_hw_constraint_list *sysclk_constraints; | 55 | struct snd_pcm_hw_constraint_list *sysclk_constraints; |
57 | u16 reg_cache[WM8988_NUM_REG]; | ||
58 | }; | 56 | }; |
59 | 57 | ||
60 | 58 | ||
@@ -677,7 +675,7 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec, | |||
677 | break; | 675 | break; |
678 | 676 | ||
679 | case SND_SOC_BIAS_STANDBY: | 677 | case SND_SOC_BIAS_STANDBY: |
680 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 678 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
681 | /* VREF, VMID=2x5k */ | 679 | /* VREF, VMID=2x5k */ |
682 | snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x1c1); | 680 | snd_soc_write(codec, WM8988_PWR1, pwr_reg | 0x1c1); |
683 | 681 | ||
@@ -693,7 +691,7 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec, | |||
693 | snd_soc_write(codec, WM8988_PWR1, 0x0000); | 691 | snd_soc_write(codec, WM8988_PWR1, 0x0000); |
694 | break; | 692 | break; |
695 | } | 693 | } |
696 | codec->bias_level = level; | 694 | codec->dapm.bias_level = level; |
697 | return 0; | 695 | return 0; |
698 | } | 696 | } |
699 | 697 | ||
@@ -759,6 +757,7 @@ static int wm8988_resume(struct snd_soc_codec *codec) | |||
759 | static int wm8988_probe(struct snd_soc_codec *codec) | 757 | static int wm8988_probe(struct snd_soc_codec *codec) |
760 | { | 758 | { |
761 | struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); | 759 | struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); |
760 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
762 | int ret = 0; | 761 | int ret = 0; |
763 | u16 reg; | 762 | u16 reg; |
764 | 763 | ||
@@ -790,9 +789,9 @@ static int wm8988_probe(struct snd_soc_codec *codec) | |||
790 | 789 | ||
791 | snd_soc_add_controls(codec, wm8988_snd_controls, | 790 | snd_soc_add_controls(codec, wm8988_snd_controls, |
792 | ARRAY_SIZE(wm8988_snd_controls)); | 791 | ARRAY_SIZE(wm8988_snd_controls)); |
793 | snd_soc_dapm_new_controls(codec, wm8988_dapm_widgets, | 792 | snd_soc_dapm_new_controls(dapm, wm8988_dapm_widgets, |
794 | ARRAY_SIZE(wm8988_dapm_widgets)); | 793 | ARRAY_SIZE(wm8988_dapm_widgets)); |
795 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 794 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
796 | 795 | ||
797 | return 0; | 796 | return 0; |
798 | } | 797 | } |