Pull memoryless-node-allocation into release branch

[powerpc.git] / sound / ppc / tumbler.c

diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 36c5d5d..65384af 100644 (file)
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -945,35 +945,35 @@ static void device_change_handler(void *self)
                        check_mute(chip, &mix->line_mute, 0, mix->auto_mute_notify,
                                   chip->lineout_sw_ctl);
                if (mix->anded_reset)
-                       big_mdelay(10);
+                       msleep(10);
                check_mute(chip, &mix->amp_mute, 1, mix->auto_mute_notify,
                           chip->speaker_sw_ctl);
-               mix->drc_enable = 0;
        } else {
                /* unmute speaker, mute others */
                check_mute(chip, &mix->amp_mute, 0, mix->auto_mute_notify,
                           chip->speaker_sw_ctl);
                if (mix->anded_reset)
-                       big_mdelay(10);
+                       msleep(10);
                check_mute(chip, &mix->hp_mute, 1, mix->auto_mute_notify,
                           chip->master_sw_ctl);
                if (mix->line_mute.addr != 0)
                        check_mute(chip, &mix->line_mute, 1, mix->auto_mute_notify,
                                   chip->lineout_sw_ctl);
-               mix->drc_enable = 1;
        }
-       if (mix->auto_mute_notify) {
+       if (mix->auto_mute_notify)
                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
                                       &chip->hp_detect_ctl->id);
+
+#ifdef CONFIG_SND_POWERMAC_AUTO_DRC
+       mix->drc_enable = ! (headphone || lineout);
+       if (mix->auto_mute_notify)
                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
                               &chip->drc_sw_ctl->id);
-       }
-
-       /* first set the DRC so the speaker do not explode -ReneR */
        if (chip->model == PMAC_TUMBLER)
                tumbler_set_drc(mix);
        else
                snapper_set_drc(mix);
+#endif
 
        /* reset the master volume so the correct amplification is applied */
        tumbler_set_master_volume(mix);
@@ -1109,22 +1109,22 @@ static void tumbler_reset_audio(pmac_t *chip)
                DBG("(I) codec anded reset !\n");
                write_audio_gpio(&mix->hp_mute, 0);
                write_audio_gpio(&mix->amp_mute, 0);
-               big_mdelay(200);
+               msleep(200);
                write_audio_gpio(&mix->hp_mute, 1);
                write_audio_gpio(&mix->amp_mute, 1);
-               big_mdelay(100);
+               msleep(100);
                write_audio_gpio(&mix->hp_mute, 0);
                write_audio_gpio(&mix->amp_mute, 0);
-               big_mdelay(100);
+               msleep(100);
        } else {
                DBG("(I) codec normal reset !\n");
 
                write_audio_gpio(&mix->audio_reset, 0);
-               big_mdelay(200);
+               msleep(200);
                write_audio_gpio(&mix->audio_reset, 1);
-               big_mdelay(100);
+               msleep(100);
                write_audio_gpio(&mix->audio_reset, 0);
-               big_mdelay(100);
+               msleep(100);
        }
 }
 
@@ -1370,6 +1370,17 @@ int __init snd_pmac_tumbler_init(pmac_t *chip)
        if ((err = snd_ctl_add(chip->card, chip->drc_sw_ctl)) < 0)
                return err;
 
+       /* set initial DRC range to 60% */
+       if (chip->model == PMAC_TUMBLER)
+               mix->drc_range = (TAS3001_DRC_MAX * 6) / 10;
+       else
+               mix->drc_range = (TAS3004_DRC_MAX * 6) / 10;
+       mix->drc_enable = 1; /* will be changed later if AUTO_DRC is set */
+       if (chip->model == PMAC_TUMBLER)
+               tumbler_set_drc(mix);
+       else
+               snapper_set_drc(mix);
+
 #ifdef CONFIG_PM
        chip->suspend = tumbler_suspend;
        chip->resume = tumbler_resume;