Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 170145
b: refs/heads/master
c: b5ab887
h: refs/heads/master
i:
  170143: e447554
v: v3
  • Loading branch information
Mark Brown committed Aug 18, 2009
1 parent 9a78e7c commit c7eda6a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 431f7771774e8f37dde5acb3f7c4c5f6fa1109e3
refs/heads/master: b5ab887e6dfa12c32ef39827da47d5d021320a3f
7 changes: 5 additions & 2 deletions trunk/sound/soc/codecs/wm8711.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <sound/tlv.h>
#include <sound/initval.h>

#include "wm8711.h"
Expand All @@ -50,10 +51,12 @@ static const u16 wm8711_reg[WM8711_CACHEREGNUM] = {

#define wm8711_reset(c) snd_soc_write(c, WM8711_RESET, 0)

static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);

static const struct snd_kcontrol_new wm8711_snd_controls[] = {

SOC_DOUBLE_R("Master Playback Volume", WM8711_LOUT1V, WM8711_ROUT1V,
0, 127, 0),
SOC_DOUBLE_R_TLV("Master Playback Volume", WM8711_LOUT1V, WM8711_ROUT1V,
0, 127, 0, out_tlv),
SOC_DOUBLE_R("Master Playback ZC Switch", WM8711_LOUT1V, WM8711_ROUT1V,
7, 1, 0),

Expand Down

0 comments on commit c7eda6a

Please sign in to comment.