summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMargarita Olaya Cabrera <magi.olaya@ti.com>2010-06-03 11:54:38 -0500
committerJorge Eduardo Candelaria <jorge.candelaria@ti.com>2010-07-08 13:00:52 -0500
commit4ae5d1bdce703b794b734f7cc945488765345858 (patch)
treeed0d86adba47fe50581a4b70c0e749f69427d83d /sound
parentcc1013a3b4d71ebd9b2559ab090c76de21781b2a (diff)
Revert "ASoC: ABE: Fixes for hal 6.22"
This reverts commit eb2fbe8fa152824d7227eef833de9d5c77bf6ff1. Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com> Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/abe/abe_api.c2
-rw-r--r--sound/soc/codecs/abe/abe_ini.c22
2 files changed, 1 insertions, 23 deletions
diff --git a/sound/soc/codecs/abe/abe_api.c b/sound/soc/codecs/abe/abe_api.c
index a4a4630a87dc..471a5910099e 100644
--- a/sound/soc/codecs/abe/abe_api.c
+++ b/sound/soc/codecs/abe/abe_api.c
@@ -890,7 +890,7 @@ void abe_disable_data_transfer(abe_port_id id)
/* disable DMA requests */
abe_disable_dma_request(id);
/* disable ATC transfers */
- abe_disable_atc(id);
+ abe_init_atc(id);
abe_clean_temporary_buffers(id);
}
diff --git a/sound/soc/codecs/abe/abe_ini.c b/sound/soc/codecs/abe/abe_ini.c
index 99be36121790..5beeb465aa71 100644
--- a/sound/soc/codecs/abe/abe_ini.c
+++ b/sound/soc/codecs/abe/abe_ini.c
@@ -34,28 +34,6 @@
void abe_hw_configuration()
{
abe_uint32 atc_reg;
- abe_port_protocol_t *protocol;
- abe_data_format_t format;
-
- /* initializes the ABE ATC descriptor in DMEM - MCPDM_UL */
- protocol = &(abe_port[PDM_UL_PORT].protocol);
- format = abe_port[PDM_UL_PORT].format;
- abe_init_atc(PDM_UL_PORT);
- abe_init_io_tasks(PDM_UL_PORT, &format, protocol);
-
- /* initializes the ABE ATC descriptor in DMEM - MCPDM_DL */
- protocol = &(abe_port[PDM_DL_PORT].protocol);
- format = abe_port[PDM_DL_PORT].format;
- abe_init_atc(PDM_DL_PORT);
- abe_init_io_tasks(PDM_DL_PORT, &format, protocol);
-
- /* one DMIC port enabled = all DMICs enabled, since there is
- * single DMIC path for all DMICs
- */
- protocol = &(abe_port[DMIC_PORT].protocol);
- format = abe_port[DMIC_PORT].format;
- abe_init_atc(DMIC_PORT);
- abe_init_io_tasks(DMIC_PORT, &format, protocol);
/* enables the DMAreq from AESS AESS_DMAENABLE_SET = 255 */
atc_reg = 0xFF;