Merge branch 'for-3.2' into for-3.3

[deliverable/linux.git] / sound / soc / codecs / alc5632.c

diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index c32eadebb7627f0049b5ccc10eb7d47aca1b55ed..390e437d7c5e08ef75a8406b5572f245d90eaaeb 100644 (file)
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -36,7 +36,6 @@
  * ALC5632 register cache
  */
 static struct reg_default  alc5632_reg_defaults[] = {
-       {   0, 0x59B4 },        /* R0   - Reset */
        {   2, 0x8080 },        /* R2   - Speaker Output Volume */
        {   4, 0x8080 },        /* R4   - Headphone Output Volume */
        {   6, 0x8080 },        /* R6   - AUXOUT Volume */
@@ -52,7 +51,6 @@ static struct reg_default  alc5632_reg_defaults[] = {
        {  34, 0x0000 },        /* R34  - Microphone Control */
        {  36, 0x00C0 },    /* R36  - Codec Digital MIC/Digital Boost
                                                   Control */
-       {  38, 0xEF00 },        /* R38  - Power Down Control/Status */
        {  46, 0x0000 },        /* R46  - Stereo DAC/Voice DAC/Stereo ADC
                                                   Function Select */
        {  52, 0x8000 },        /* R52  - Main Serial Data Port Control
@@ -70,9 +68,7 @@ static struct reg_default  alc5632_reg_defaults[] = {
        {  78, 0xBE3E },        /* R78  - GPIO Pin Polarity */
        {  80, 0x0000 },        /* R80  - GPIO Pin Sticky */
        {  82, 0x0000 },        /* R82  - GPIO Pin Wake Up */
-       {  84, 0x803A },        /* R84  - GPIO Pin Status */
        {  86, 0x0000 },        /* R86  - Pin Sharing */
-       {  88, 0x0000 },        /* R88  - Over-Temp/Current Status */
        {  90, 0x0009 },        /* R90  - Soft Volume Control Setting */
        {  92, 0x0000 },        /* R92  - GPIO_Output Pin Control */
        {  94, 0x3000 },        /* R94  - MISC Control */
@@ -82,9 +78,6 @@ static struct reg_default  alc5632_reg_defaults[] = {
        { 104, 0x0553 },        /* R104 - Pseudo Stereo and Spatial Effect
                                                   Block Control */
        { 106, 0x0000 },        /* R106 - Private Register Address */
-       { 108, 0x0000 },        /* R108 - Private Register Data */
-       { 110, 0x0000 },        /* R110 - EQ Control and Status/ADC
-                                                       HPF Control */
 };
 
 /* codec private data */
@@ -386,8 +379,8 @@ SND_SOC_DAPM_PGA("MIC1 PGA", ALC5632_PWR_MANAG_ADD3, 3, 0, NULL, 0),
 SND_SOC_DAPM_PGA("MIC2 PGA", ALC5632_PWR_MANAG_ADD3, 2, 0, NULL, 0),
 SND_SOC_DAPM_PGA("MIC1 Pre Amp", ALC5632_PWR_MANAG_ADD3, 1, 0, NULL, 0),
 SND_SOC_DAPM_PGA("MIC2 Pre Amp", ALC5632_PWR_MANAG_ADD3, 0, 0, NULL, 0),
-SND_SOC_DAPM_SUPPLY("Mic Bias1", ALC5632_PWR_MANAG_ADD1, 3, 0, NULL, 0),
-SND_SOC_DAPM_SUPPLY("Mic Bias2", ALC5632_PWR_MANAG_ADD1, 2, 0, NULL, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS1", ALC5632_PWR_MANAG_ADD1, 3, 0, NULL, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS2", ALC5632_PWR_MANAG_ADD1, 2, 0, NULL, 0),
 
 SND_SOC_DAPM_PGA_E("D Amp", ALC5632_PWR_MANAG_ADD2, 14, 0, NULL, 0,
        amp_mixer_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
@@ -931,7 +924,7 @@ static int alc5632_set_bias_level(struct snd_soc_codec *codec,
                        | SNDRV_PCM_FMTBIT_S24_LE \
                        | SNDRV_PCM_FMTBIT_S32_LE)
 
-static struct snd_soc_dai_ops alc5632_dai_ops = {
+static const struct snd_soc_dai_ops alc5632_dai_ops = {
                .hw_params = alc5632_pcm_hw_params,
                .digital_mute = alc5632_mute,
                .set_fmt = alc5632_set_dai_fmt,
@@ -963,7 +956,7 @@ static struct snd_soc_dai_driver alc5632_dai = {
 };
 
 #ifdef CONFIG_PM
-static int alc5632_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
+static int alc5632_suspend(struct snd_soc_codec *codec)
 {
        alc5632_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;