diff options
| author | Lu Guanqun <guanqun.lu@intel.com> | 2011-05-03 17:38:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-10 12:59:02 -0700 |
| commit | b8df15b2a7479903eb7051ce96a5c8dac5e60a18 (patch) | |
| tree | 106c52b646dc09cd886759c36099552faf1030c5 /drivers/staging/intel_sst/intelmid.h | |
| parent | e1bfee2673b067525a48450eede263370f425182 (diff) | |
| download | op-kernel-dev-b8df15b2a7479903eb7051ce96a5c8dac5e60a18.zip op-kernel-dev-b8df15b2a7479903eb7051ce96a5c8dac5e60a18.tar.gz | |
intel_sst: add Master Volume
With this patch, Master Volume will control AUDIOLVOL(0x10c) and
AUDIORVOL(0x10d); while PCM Volume will control HPLVOL(0x123) and
HPRVOL(0x124).
Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/intel_sst/intelmid.h')
| -rw-r--r-- | drivers/staging/intel_sst/intelmid.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/intel_sst/intelmid.h b/drivers/staging/intel_sst/intelmid.h index 3201d5a..14a7ba0 100644 --- a/drivers/staging/intel_sst/intelmid.h +++ b/drivers/staging/intel_sst/intelmid.h @@ -57,9 +57,9 @@ #define MAX_CHANNEL_DMIC 5 #define FIFO_SIZE 0 /* fifo not being used */ #define INTEL_MAD "Intel MAD" -#define MAX_CTRL_MRST 7 +#define MAX_CTRL_MRST 8 #define MAX_CTRL_MFLD 7 -#define MAX_CTRL 7 +#define MAX_CTRL 8 #define MAX_VENDORS 4 /* TODO +6 db */ #define MAX_VOL 64 @@ -145,6 +145,8 @@ struct snd_control_val { int playback_vol_min; int capture_vol_max; int capture_vol_min; + int master_vol_max; + int master_vol_min; }; struct mad_stream_pvt { @@ -175,6 +177,7 @@ enum _widget_ctrl { PLAYBACK_MUTE, CAPTURE_VOL, CAPTURE_MUTE, + MASTER_VOL, MASTER_MUTE }; enum _widget_ctrl_mfld { |
