From 4ae5d1bdce703b794b734f7cc945488765345858 Mon Sep 17 00:00:00 2001 From: Margarita Olaya Cabrera Date: Thu, 3 Jun 2010 11:54:38 -0500 Subject: Revert "ASoC: ABE: Fixes for hal 6.22" This reverts commit eb2fbe8fa152824d7227eef833de9d5c77bf6ff1. Signed-off-by: Margarita Olaya Cabrera Signed-off-by: Jorge Eduardo Candelaria --- sound/soc/codecs/abe/abe_api.c | 2 +- sound/soc/codecs/abe/abe_ini.c | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) (limited to 'sound') 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; -- cgit v1.2.3