fix compiler warnings and add calling adjust volume code

diff --git a/sound/soc/codecs/aic326x_tiload.c b/sound/soc/codecs/aic326x_tiload.c
index df1581e2a1f42bed287959b68cd66dd712cc558c..07733d08c106b1eb17ac233bd32f10a24609f31e 100644 (file)
--- a/sound/soc/codecs/aic326x_tiload.c
+++ b/sound/soc/codecs/aic326x_tiload.c
@@ -269,10 +269,10 @@ static ssize_t tiload_write(struct file *file, const char __user * buf,
        
 }
 
-static int tiload_ioctl(struct file *filp,
+static long tiload_ioctl(struct file *filp,
                        unsigned int cmd, unsigned long arg)
 {
-       int num = 0;
+       long num = 0;
        void __user *argp = (void __user *)arg;
        if (_IOC_TYPE(cmd) != aic3262_IOC_MAGIC)
                return -ENOTTY;

diff --git a/sound/soc/codecs/aic3xxx_cfw_ops.c b/sound/soc/codecs/aic3xxx_cfw_ops.c
index ca1cddb944a538f314421da42b19dc105687ae9a..168defe5baca58ba5847af052fdf7babd0264f04 100644 (file)
--- a/sound/soc/codecs/aic3xxx_cfw_ops.c
+++ b/sound/soc/codecs/aic3xxx_cfw_ops.c
@@ -92,12 +92,14 @@ int aic3xxx_cfw_setmode_cfg(void *pv, int mode, int cfg)
     cfw_state *ps = pv;
     cfw_project *pjt = ps->pjt;
     int which = 0;
-
+       cfw_pfw *pfw;
+       cfw_image *im;
+       
     if (mode >= pjt->nmode)
         return -1;
     if (pjt->mode[mode]->pfw < pjt->npfw) {   // New mode uses miniDSP
         // FIXME: Add support for entry and exit sequences
-        cfw_pfw *pfw = pjt->pfw[pjt->mode[mode]->pfw];
+        pfw = pjt->pfw[pjt->mode[mode]->pfw];
         // Make sure cfg is valid and supported in this mode
         if (cfg >= pfw->ncfg ||
                 !(pjt->mode[mode]->supported_cfgs&(1u<<cfg)))
@@ -109,7 +111,7 @@ int aic3xxx_cfw_setmode_cfg(void *pv, int mode, int cfg)
          * where the base PFW uses both miniDSPs where a particular
          * overlay applies only to one
          */
-        cfw_image *im = pfw->base;
+        im = pfw->base;
         if (im->block[CFW_BLOCK_A_INST])
             which |= AIC3XX_COPS_MDSP_A;
         if (im->block[CFW_BLOCK_D_INST])

diff --git a/sound/soc/codecs/aic3xxx_cfw_ops.h b/sound/soc/codecs/aic3xxx_cfw_ops.h
index 82ca5f2a2527d542d3edc6f4ea2f8d5195341884..a9306f7438b4192ae80ff73a41522e6dee75ed8e 100644 (file)
--- a/sound/soc/codecs/aic3xxx_cfw_ops.h
+++ b/sound/soc/codecs/aic3xxx_cfw_ops.h
@@ -29,7 +29,7 @@ int aic3xxx_cfw_set_pll(void *pv, int asi);
 typedef struct aic3xxx_codec_ops {
     int (*reg_read)(void *p, unsigned int reg);
     int (*reg_write)(void *p, unsigned int reg,
-            unsigned int val);
+            unsigned char val);
     int (*set_bits)(void *p, unsigned int reg, 
             unsigned char mask, unsigned char val);
     int (*bulk_read)(void *p, unsigned int reg, 

diff --git a/sound/soc/codecs/tlv320aic326x.c b/sound/soc/codecs/tlv320aic326x.c
old mode 100644 (file)
new mode 100755 (executable)
index bffb7e1..ce91b34
--- a/sound/soc/codecs/tlv320aic326x.c
+++ b/sound/soc/codecs/tlv320aic326x.c
@@ -262,10 +262,13 @@ static const struct snd_kcontrol_new aic3262_snd_controls[] = {
 #endif
        /*HP Driver Gain Control*/
        SOC_DOUBLE_R_SX_TLV("HeadPhone Driver Amplifier Volume", AIC3262_HPL_VOL, AIC3262_HPR_VOL, 6, 0xffffffb9, 0xffffffce, output_gain_tlv),
+       SOC_DOUBLE_R_SX_TLV("Headphone Volume", AIC3262_HPL_VOL, AIC3262_HPR_VOL, 6, 0xffffffb9, 0xffffffce, output_gain_tlv),  
        /*LO Driver Gain Control*/
        SOC_DOUBLE_TLV("Speaker Amplifier Volume", AIC3262_SPK_AMP_CNTL_R4, 4, 0, 5, 0, spk_gain_tlv),
+       SOC_DOUBLE_TLV("Speaker Volume", AIC3262_SPK_AMP_CNTL_R4, 4, 0, 5, 0, spk_gain_tlv),
 
        SOC_DOUBLE_R_SX_TLV("Receiver Amplifier Volume", AIC3262_REC_AMP_CNTL_R5, AIC3262_RAMPR_VOL, 6, 0xffffffb9, 0xffffffd6, output_gain_tlv),
+       SOC_DOUBLE_R_SX_TLV("Earpiece Volume", AIC3262_REC_AMP_CNTL_R5, AIC3262_RAMPR_VOL, 6, 0xffffffb9, 0xffffffd6, output_gain_tlv),
 
        SOC_DOUBLE_R_SX_TLV("PCM Capture Volume", 
                        AIC3262_LADC_VOL, AIC3262_RADC_VOL, 7,0xffffff68, 0xffffffa8, adc_vol_tlv),

diff --git a/sound/soc/codecs/tlv320aic326x.h b/sound/soc/codecs/tlv320aic326x.h
index 00b34121afc832915cf976f772a830a841bdd8e4..9ca6c8f6060a6e1607899a06bf1fb8834e64da1c 100644 (file)
--- a/sound/soc/codecs/tlv320aic326x.h
+++ b/sound/soc/codecs/tlv320aic326x.h
@@ -173,7 +173,7 @@ struct aic3262_priv {
        struct aic3262_pdata *pdata;
        int mute_asi; // Bit 0 -> ASI1, Bit 1-> ASI2, Bit 2 -> ASI3
        int dsp_runstate;
-       struct firmware *cur_fw;
+       const struct firmware *cur_fw;
        int isdefault_fw;
 };
 /*struct aic3262_configs {