ASoC: ABE DSP: Update driver code according to ABE HAL 08.50 API update

Update driver part due to new ABE HAL release 08.50.

Signed-off-by: sebastien Guiriec <s-guiriec@ti.com>
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>

2 files changed, 5 insertions, 23 deletions

diff --git a/sound/soc/omap/omap-abe-dsp.c b/sound/soc/omap/omap-abe-dsp.c
index 9872c9c384fc..01d7ce324c69 100644
--- a/sound/soc/omap/omap-abe-dsp.c
+++ b/sound/soc/omap/omap-abe-dsp.c
@@ -250,11 +250,6 @@ void abe_dsp_disable_data_transfer(int port)
 	struct platform_device *pdev = abe->pdev;
 
 	abe_disable_data_transfer(port);
-	udelay(250);
-	/*
-	abe_stop_event_generator();
-	udelay(500);
-	*/
 	pm_runtime_put_sync(&pdev->dev);
 }
 
@@ -489,7 +484,7 @@ static int ul_mux_put_route(struct snd_kcontrol *kcontrol,
 		dev_dbg(widget->dapm->dev, "router table [%d] = %d\n", i, abe->router[i]);
 
 	/* 2nd arg here is unused */
-	abe_set_router_configuration(UPROUTE, 0, abe->router);
+	abe_set_router_configuration(UPROUTE, 0, (u32 *)abe->router);
 
 	abe->dapm[e->reg] = ucontrol->value.integer.value[0];
 	snd_soc_dapm_mux_update_power(widget, kcontrol, abe->dapm[e->reg], mux, e);
@@ -718,7 +713,7 @@ static int abe_get_equalizer(struct snd_kcontrol *kcontrol,
 	case EQ2R:
 		ucontrol->value.integer.value[0] = abe->dl21_equ_profile;
 		break;
-	case EQMIC:
+	case EQAMIC:
 		ucontrol->value.integer.value[0] = abe->amic_equ_profile;
 		break;
 	default:
@@ -756,7 +751,7 @@ static int abe_put_equalizer(struct snd_kcontrol *kcontrol,
 				sizeof(dl21_equ_coeffs[val]));
 		abe->dl21_equ_profile = val;
 		break;
-	case EQMIC:
+	case EQAMIC:
 		equ_params.equ_length = NBAMICCOEFFS;
 		memcpy(equ_params.coef.type1, amic_equ_coeffs[val],
 				sizeof(amic_equ_coeffs[val]));
@@ -812,7 +807,7 @@ static const struct soc_enum dl21_equalizer_enum =
 	SOC_ENUM_SINGLE(EQ2R, 0, NBDL21EQ_PROFILES, dl21_equ_texts);
 
 static const struct soc_enum amic_equalizer_enum =
-	SOC_ENUM_SINGLE(EQMIC, 0, NBAMICEQ_PROFILES, amic_equ_texts);
+	SOC_ENUM_SINGLE(EQAMIC, 0, NBAMICEQ_PROFILES, amic_equ_texts);
 
 static const char *route_ul_texts[] =
 	{"None", "DMic0L", "DMic0R", "DMic1L", "DMic1R", "DMic2L", "DMic2R",
diff --git a/sound/soc/omap/omap-abe.c b/sound/soc/omap/omap-abe.c
index ec30fa35df26..1a8a0080557d 100644
--- a/sound/soc/omap/omap-abe.c
+++ b/sound/soc/omap/omap-abe.c
@@ -994,9 +994,6 @@ static void enable_be_ports(struct snd_soc_pcm_runtime *rtd, int stream)
 			break;
 		case OMAP_ABE_DAI_PDM_UL:
 			if (be_is_pending(be_rtd, stream)) {
-			/* switch main port to UL since DL is inactive */
-				if (pdm_ready(&abe_data))
-					abe_select_main_port(PDM_UL_PORT);
 				abe_dai_enable_data_transfer(PDM_UL_PORT);
 			}
 			abe_data.pdm_ul_status = DAI_STARTED;
@@ -1119,20 +1116,12 @@ static void disable_be_ports(struct snd_soc_pcm_runtime *rtd, int stream)
 			abe_data.pdm_dl_status[0] = DAI_STOPPED;
 			if (be_is_pending(be_rtd, stream) && pdm_ready(&abe_data)) {
 				abe_dai_disable_data_transfer(PDM_DL_PORT);
-
-				/* switch main port to UL since DL is inactive */
-				if (abe_data.pdm_ul_status == DAI_STARTED)
-					abe_select_main_port(PDM_UL_PORT);
 			}
 			break;
 		case OMAP_ABE_DAI_PDM_DL2:
 			abe_data.pdm_dl_status[1] = DAI_STOPPED;
 			if (be_is_pending(be_rtd, stream) && pdm_ready(&abe_data)) {
-				abe_dai_disable_data_transfer(PDM_DL2_PORT);
-
-				/* switch main port to UL since DL is inactive */
-				if (abe_data.pdm_ul_status == DAI_STARTED)
-					abe_select_main_port(PDM_UL_PORT);
+				abe_dai_disable_data_transfer(PDM_DL_PORT);
 			}
 			break;
 		case OMAP_ABE_DAI_PDM_VIB:
@@ -1144,8 +1133,6 @@ static void disable_be_ports(struct snd_soc_pcm_runtime *rtd, int stream)
 			abe_data.pdm_ul_status = DAI_STOPPED;
 			if (be_is_pending(be_rtd, stream)) {
 				abe_dai_disable_data_transfer(PDM_UL_PORT);
-				/* switch main port to DL since UL is inactive */
-				abe_select_main_port(PDM_DL_PORT);
 			}
 			break;
 		case OMAP_ABE_DAI_BT_VX: