From b8df15b2a7479903eb7051ce96a5c8dac5e60a18 Mon Sep 17 00:00:00 2001 From: Lu Guanqun Date: Tue, 3 May 2011 17:38:18 +0100 Subject: 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 Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/staging/intel_sst/intelmid.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/staging/intel_sst/intelmid.h') 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 { -- cgit v1.1