diff options
| author | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2009-03-24 13:59:23 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 16:15:39 +0100 |
| commit | 2f47c8c5556e91f309e24162263ebacff6973007 (patch) | |
| tree | c79f2c411793070e9b6ec22048f5cde3ef9f3c7b /arch/avr32/boards | |
| parent | 6b0c9351426bdedcbe8fb81149a072de96991666 (diff) | |
| download | linux-2f47c8c5556e91f309e24162263ebacff6973007.tar.gz linux-2f47c8c5556e91f309e24162263ebacff6973007.tar.bz2 linux-2f47c8c5556e91f309e24162263ebacff6973007.zip | |
avr32: at32ap700x: setup DMA for AC97C in the machine code
This patch will adjust the setup the DMA controller for the AC97
Controller in the at32ap700x machine code. This setup matches the new
ALSA driver for the AC97C.
The struct ac97c_platform_data has been moved into its own header file
located in the sound include path.
Tested on ATSTK1006 + ATSTK1000.
This patch will setup the AC97 controller properly for the adjusted
machine code. Both EVKLCD10x and Hammerhead board has been updated.
Tested on EVKLCD10x, and copied to Hammerhead board.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
[haavard.skinnemoen@atmel.com: fold with board code update]
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'arch/avr32/boards')
| -rw-r--r-- | arch/avr32/boards/atngw100/evklcd10x.c | 9 | ||||
| -rw-r--r-- | arch/avr32/boards/hammerhead/setup.c | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/avr32/boards/atngw100/evklcd10x.c b/arch/avr32/boards/atngw100/evklcd10x.c index ae6991205409..00337112c5ac 100644 --- a/arch/avr32/boards/atngw100/evklcd10x.c +++ b/arch/avr32/boards/atngw100/evklcd10x.c @@ -23,11 +23,10 @@ #include <mach/portmux.h> #include <mach/board.h> +#include <sound/atmel-ac97c.h> + static struct ac97c_platform_data __initdata ac97c0_data = { - .dma_rx_periph_id = 3, - .dma_tx_periph_id = 4, - .dma_controller_id = 0, - .reset_pin = GPIO_PIN_PB(19), + .reset_pin = GPIO_PIN_PB(19), }; #ifdef CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA @@ -167,7 +166,7 @@ static int __init atevklcd10x_init(void) fbmem_start, fbmem_size, ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL); - at32_add_device_ac97c(0, &ac97c0_data); + at32_add_device_ac97c(0, &ac97c0_data, AC97C_BOTH); return 0; } diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c index 4d2fe82b2029..a5c2da25c4fe 100644 --- a/arch/avr32/boards/hammerhead/setup.c +++ b/arch/avr32/boards/hammerhead/setup.c @@ -29,6 +29,8 @@ #include <mach/init.h> #include <mach/portmux.h> +#include <sound/atmel-ac97c.h> + #include "../../mach-at32ap/clock.h" #include "flash.h" @@ -233,7 +235,7 @@ static int __init hammerhead_init(void) i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info)); #ifdef CONFIG_BOARD_HAMMERHEAD_SND - at32_add_device_ac97c(0, &ac97c_data); + at32_add_device_ac97c(0, &ac97c_data, AC97C_BOTH); #endif /* Select the Touchscreen interrupt pin mode */ |