staging: sst: Remove the aava bits

We don't need these special cases any more.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/intel_sst/TODO

@@ -2,11 +2,12 @@ TODO
 ----
 
 Get the memrar driver cleaned up and upstream (dependancy blocking SST)
-Get the jack header entries accepted
+Replace long/short press with two virtual buttons
 Review the printks and kill off any left over ST_ERR: messages
 Review the misc device ioctls for 32/64bit safety and sanity
 Review the misc device ioctls for size safety depending on config and decide
 	if space/unused areas should be left
+What the sound folks turn up on full review
+Using the ALSA frameworks properly
 
-Anything the sound folks turn up on full review
 

drivers/staging/intel_sst/intelmid.c

@@ -649,21 +649,8 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata)
 			}
 
 		}
-		intelmaddata->jack_prev_state  = value ;
-
+		intelmaddata->jack_prev_state = value;
 	}
-	if (is_aava() && jack) {
-		if (present) {
-			pr_debug("sst: Jack... YES\n");
-			scard_ops->set_output_dev(STEREO_HEADPHONE);
-
-		} else {
-			pr_debug("sst: Jack... NO\n");
-			scard_ops->set_output_dev(INTERNAL_SPKR);
-
-		}
-	}
-
 	if (jack_event_flag)
 		sst_mad_send_jack_report(jack, buttonpressflag, present);
 }

drivers/staging/intel_sst/intelmid_v1_control.c

@@ -76,76 +76,6 @@ enum _reg_v2 {
  */
 static int mx_init_card(void)
 {
-	if (is_aava())  {
-
-		struct sc_reg_access sc_access[] = {
-			{0x200, 0x00, 0x0},
-			{0x201, 0xC0, 0x0},
-			{0x202, 0x00, 0x0},
-			{0x203, 0x00, 0x0},
-			{0x204, 0x0e, 0x0},
-			{0x205, 0x20, 0x0},
-			{0x206, 0x00, 0x0},
-			{0x207, 0x00, 0x0},
-			{0x208, 0x00, 0x0},
-			{0x209, 0x51, 0x0},
-			{0x20a, 0x00, 0x0},
-			{0x20b, 0x5a, 0x0},
-			{0x20c, 0xbe, 0x0},
-			{0x20d, 0x90, 0x0},
-			{0x20e, 0x51, 0x0},
-			{0x20f, 0x00, 0x0},
-			{0x210, 0x21, 0x0},
-			{0x211, 0x00, 0x0},
-			{0x212, 0x00, 0x0},
-			{0x213, 0x00, 0x0},
-			{0x214, 0x41, 0x0},
-			{0x215, 0x81, 0x0},
-			{0x216, 0x00, 0x0},
-			{0x217, 0x00, 0x0},
-			{0x218, 0x00, 0x0},
-			{0x219, 0x00, 0x0},
-			{0x21a, 0x00, 0x0},
-			{0x21b, 0x00, 0x0},
-			{0x21c, 0x00, 0x0},
-			{0x21d, 0x00, 0x0},
-			{0x21e, 0x00, 0x0},
-			{0x21f, 0x00, 0x0},
-			{0x220, 0x00, 0x0},
-			{0x221, 0x00, 0x0},
-			{0x222, 0x51, 0x0},
-			{0x223, 0x20, 0x0}, /* Jack detection: 00 -> 01 */
-			{0x224, 0x40, 0x0},
-			{0x225, 0x80, 0x0}, /* JAck detection: 00 -> 80 */
-			{0x226, 0x00, 0x0},
-			{0x227, 0x00, 0x0},
-			{0xf9, 0x40, 0x0},
-			{0xfa, 0x1F, 0x0},
-			{0xfb, 0x1F, 0x0},
-			{0xfc, 0x1F, 0x0},
-			{0xfd, 0x1F, 0x0},
-			{0xfe, 0x00, 0x0},
-			{0xff, 0x00, 0x0}, /* Removed sel_output */
-		};
-		int retval;
-
-		/*init clock sig to voice codec*/
-		retval = gpio_request(KOSKI_VOICE_CODEC_ENABLE,
-					"sound_voice_codec");
-		if (retval) {
-			pr_err("sst: Error enabling voice codec clock\n");
-		} else {
-			gpio_direction_output(KOSKI_VOICE_CODEC_ENABLE, 1);
-			pr_debug("sst: Voice codec clock enabled\n");
-		}
-
-		snd_pmic_ops_mx.card_status = SND_CARD_INIT_DONE;
-		snd_pmic_ops_mx.master_mute = UNMUTE;
-		snd_pmic_ops_mx.mute_status = UNMUTE;
-		snd_pmic_ops_mx.num_channel = 2;
-		pr_debug("**************inside aava\n");
-		return sst_sc_reg_access(sc_access, PMIC_WRITE, 47);
-	} else {
 	struct sc_reg_access sc_access[] = {
 		{0x200, 0x80, 0x00},
 		{0x201, 0xC0, 0x00},
@@ -200,7 +130,6 @@ static int mx_init_card(void)
 	snd_pmic_ops_mx.master_mute = UNMUTE;
 	snd_pmic_ops_mx.mute_status = UNMUTE;
 	return sst_sc_reg_access(sc_access, PMIC_WRITE, 47);
-	}
 }
 
 static int mx_init_capture_card(void)
@@ -300,8 +229,6 @@ static int mx_power_up_pb(unsigned int port)
 		if (retval)
 			return retval;
 	}
-	if ((is_aava()) && port == 1)
-		mx_init_playback_card();
 	retval = mx_enable_audiodac(MUTE);
 	if (retval)
 		return retval;
@@ -372,12 +299,6 @@ static int mx_power_up_cp(unsigned int port)
 			return retval;
 	}
 
-	if (is_aava()) {
-		retval = mx_init_capture_card();
-		if (retval)
-			return retval;
-		return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-	} else
 	return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
 }
 
@@ -499,7 +420,6 @@ static int mx_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
 {
 	int retval = 0;
 
-	if (!is_aava()) {
 	int config1 = 0, config2 = 0, filter = 0xB3;
 	struct sc_reg_access sc_access[5];
 
@@ -548,11 +468,9 @@ static int mx_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
 		config2 = 0x00;
 		break;
 	}
-
 	snd_pmic_ops_mx.num_channel = num_channel;
 	/*mute the right channel if MONO*/
 	if (snd_pmic_ops_mx.num_channel == 1)	{
-
 		sc_access[0].reg_addr = VOL_CTRL_RT;
 		sc_access[0].value = 0x40;
 		sc_access[0].mask = MASK6;
@@ -561,8 +479,7 @@ static int mx_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
 		sc_access[1].value = 0x05;
 		sc_access[1].mask = MASK0|MASK1|MASK2;
 
-			retval = sst_sc_reg_access(sc_access,
-					PMIC_READ_MODIFY, 2);
+		retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
 		if (retval)
 			return retval;
 	} else {
@@ -574,8 +491,7 @@ static int mx_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
 		sc_access[1].value = 0x04;
 		sc_access[1].mask = MASK0|MASK1|MASK2;
 
-			retval = sst_sc_reg_access(sc_access,
-					PMIC_READ_MODIFY, 2);
+		retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
 		if (retval)
 			return retval;
 	}
@@ -599,81 +515,6 @@ static int mx_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
 	sc_access[4].value = filter;
 
 	return sst_sc_reg_access(sc_access, PMIC_WRITE, 5);
-	} else {
-		int config1 = 0, config2 = 0, filter = 0x00;
-		struct sc_reg_access sc_access[5];
-
-		pr_debug("sst: mx_set_pcm_audio_params - inside AAVA\n");
-
-		if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-			retval = mx_init_card();
-			if (retval)
-				return retval;
-		}
-
-		switch (sfreq) {
-		case 8000:
-			config1 = 0x20;
-			config2 = 0x0f;
-			filter = 0x33;
-			break;
-		case 11025:
-			config1 = 0x14;
-			config2 = 0xd8;
-			break;
-		case 12000:
-			config1 = 0x16;
-			config2 = 0xaf;
-			break;
-		case 16000:
-			config1 = 0x1e;
-			config2 = 0x3f;
-			break;
-		case 22050:
-			config1 = 0x29;
-			config2 = 0xaf;
-			break;
-		case 24000:
-			config1 = 0x2d;
-			config2 = 0x5f;
-			break;
-		case 32000:
-			config1 = 0x3c;
-			config2 = 0x7f;
-			break;
-		case 44100:
-			config1 = 0x53;
-			config2 = 0x5f;
-			break;
-		case 48000:
-			config1 = 0x5a;
-			config2 = 0xbe;
-			break;
-		}
-
-		snd_pmic_ops_mx.num_channel = num_channel;
-		/*mute the right channel if MONO*/
-		sc_access[0].reg_addr =	0x20b;
-		sc_access[0].value = config1;
-		sc_access[1].reg_addr = 0x20c;
-		sc_access[1].value = config2;
-		if (word_size == 16) {
-			sc_access[2].value = 0x51;
-			sc_access[3].value = 0x51;
-		} else if (word_size == 24) {
-			sc_access[2].value = 0x52;
-			sc_access[3].value = 0x92;
-
-		}
-
-		sc_access[2].reg_addr = 0x209;
-		sc_access[3].reg_addr = 0x20e;
-		sc_access[4].reg_addr = 0x211;
-		sc_access[4].value = filter;
-
-		return sst_sc_reg_access(sc_access, PMIC_WRITE, 5);
-	}
-	return 0;
 }
 
 static int mx_set_selected_output_dev(u8 dev_id)
@@ -742,20 +583,7 @@ static int mx_set_voice_port(int status)
 
 static int mx_set_audio_port(int status)
 {
-	int retval = 0;
-	if (is_aava()) {
-		if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT)
-			retval = mx_init_card();
-		if (retval)
-			return retval;
-		if (status == ACTIVATE) {
-			mx_init_card();
-			mx_set_selected_output_dev
-					(snd_pmic_ops_mx.output_dev_id);
-		}
-	}
-	return retval;
-
+	return 0;
 }
 
 static int mx_set_selected_input_dev(u8 dev_id)