ASoC: neo1973_wm8753: Remove scenario management code.
Lars-Peter Clausen [Mon, 7 Mar 2011 07:04:54 +0000 (08:04 +0100)]
It has been proven to be inflexible to do scenario management in kernel space.

Since actual neo1973 board support has not been merged in mainline and this
patch has been in the neo1973 tree for some time now it should be safe to remove
this functionality without breaking existing userspace.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

sound/soc/samsung/neo1973_wm8753.c

index d3cd688..fe92946 100644 (file)
 #include "dma.h"
 #include "s3c24xx-i2s.h"
 
-/* define the scenarios */
-#define NEO_AUDIO_OFF                  0
-#define NEO_GSM_CALL_AUDIO_HANDSET     1
-#define NEO_GSM_CALL_AUDIO_HEADSET     2
-#define NEO_GSM_CALL_AUDIO_BLUETOOTH   3
-#define NEO_STEREO_TO_SPEAKERS         4
-#define NEO_STEREO_TO_HEADPHONES       5
-#define NEO_CAPTURE_HANDSET            6
-#define NEO_CAPTURE_HEADSET            7
-#define NEO_CAPTURE_BLUETOOTH          8
-
 static struct snd_soc_card neo1973;
 static struct i2c_client *i2c;
 
@@ -224,113 +213,6 @@ static struct snd_soc_ops neo1973_voice_ops = {
        .hw_free = neo1973_voice_hw_free,
 };
 
-static int neo1973_scenario;
-
-static int neo1973_get_scenario(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       ucontrol->value.integer.value[0] = neo1973_scenario;
-       return 0;
-}
-
-static int set_scenario_endpoints(struct snd_soc_codec *codec, int scenario)
-{
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-       pr_debug("Entered %s\n", __func__);
-
-       switch (neo1973_scenario) {
-       case NEO_AUDIO_OFF:
-               snd_soc_dapm_disable_pin(dapm, "Audio Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_GSM_CALL_AUDIO_HANDSET:
-               snd_soc_dapm_enable_pin(dapm, "Audio Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_enable_pin(dapm, "Call Mic");
-               break;
-       case NEO_GSM_CALL_AUDIO_HEADSET:
-               snd_soc_dapm_enable_pin(dapm, "Audio Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_GSM_CALL_AUDIO_BLUETOOTH:
-               snd_soc_dapm_disable_pin(dapm, "Audio Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_enable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_STEREO_TO_SPEAKERS:
-               snd_soc_dapm_enable_pin(dapm, "Audio Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_STEREO_TO_HEADPHONES:
-               snd_soc_dapm_enable_pin(dapm, "Audio Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_CAPTURE_HANDSET:
-               snd_soc_dapm_disable_pin(dapm, "Audio Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_enable_pin(dapm, "Call Mic");
-               break;
-       case NEO_CAPTURE_HEADSET:
-               snd_soc_dapm_disable_pin(dapm, "Audio Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       case NEO_CAPTURE_BLUETOOTH:
-               snd_soc_dapm_disable_pin(dapm, "Audio Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-               break;
-       default:
-               snd_soc_dapm_disable_pin(dapm, "Audio Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
-               snd_soc_dapm_disable_pin(dapm, "GSM Line In");
-               snd_soc_dapm_disable_pin(dapm, "Headset Mic");
-               snd_soc_dapm_disable_pin(dapm, "Call Mic");
-       }
-
-       snd_soc_dapm_sync(dapm);
-
-       return 0;
-}
-
-static int neo1973_set_scenario(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
-{
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-
-       pr_debug("Entered %s\n", __func__);
-
-       if (neo1973_scenario == ucontrol->value.integer.value[0])
-               return 0;
-
-       neo1973_scenario = ucontrol->value.integer.value[0];
-       set_scenario_endpoints(codec, neo1973_scenario);
-       return 1;
-}
-
 static u8 lm4857_regs[4] = {0x00, 0x40, 0x80, 0xC0};
 
 static void lm4857_write_regs(void)
@@ -454,26 +336,16 @@ static const struct soc_enum lm4857_mode_enum[] = {
        SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(lm4857_mode), lm4857_mode),
 };
 
-static const char *neo_scenarios[] = {
-       "Off",
-       "GSM Handset",
-       "GSM Headset",
-       "GSM Bluetooth",
-       "Speakers",
-       "Headphones",
-       "Capture Handset",
-       "Capture Headset",
-       "Capture Bluetooth"
-};
-
-static const struct soc_enum neo_scenario_enum[] = {
-       SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(neo_scenarios), neo_scenarios),
-};
-
 static const DECLARE_TLV_DB_SCALE(stereo_tlv, -4050, 150, 0);
 static const DECLARE_TLV_DB_SCALE(mono_tlv, -3450, 150, 0);
 
 static const struct snd_kcontrol_new wm8753_neo1973_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Audio Out"),
+       SOC_DAPM_PIN_SWITCH("GSM Line Out"),
+       SOC_DAPM_PIN_SWITCH("GSM Line In"),
+       SOC_DAPM_PIN_SWITCH("Headset Mic"),
+       SOC_DAPM_PIN_SWITCH("Call Mic"),
+
        SOC_SINGLE_EXT_TLV("Amp Left Playback Volume", LM4857_LVOL, 0, 31, 0,
                lm4857_get_reg, lm4857_set_reg, stereo_tlv),
        SOC_SINGLE_EXT_TLV("Amp Right Playback Volume", LM4857_RVOL, 0, 31, 0,
@@ -482,8 +354,6 @@ static const struct snd_kcontrol_new wm8753_neo1973_controls[] = {
                lm4857_get_reg, lm4857_set_reg, mono_tlv),
        SOC_ENUM_EXT("Amp Mode", lm4857_mode_enum[0],
                lm4857_get_mode, lm4857_set_mode),
-       SOC_ENUM_EXT("Neo Mode", neo_scenario_enum[0],
-               neo1973_get_scenario, neo1973_set_scenario),
        SOC_SINGLE_EXT("Amp Spk 3D Playback Switch", LM4857_LVOL, 5, 1, 0,
                lm4857_get_reg, lm4857_set_reg),
        SOC_SINGLE_EXT("Amp HP 3d Playback Switch", LM4857_RVOL, 5, 1, 0,
@@ -520,7 +390,11 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
                                  ARRAY_SIZE(wm8753_dapm_widgets));
 
        /* set endpoints to default mode */
-       set_scenario_endpoints(codec, NEO_AUDIO_OFF);
+       snd_soc_dapm_disable_pin(dapm, "Audio Out");
+       snd_soc_dapm_disable_pin(dapm, "GSM Line Out");
+       snd_soc_dapm_disable_pin(dapm, "GSM Line In");
+       snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+       snd_soc_dapm_disable_pin(dapm, "Call Mic");
 
        /* add neo1973 specific controls */
        err = snd_soc_add_controls(codec, wm8753_neo1973_controls,