diff options
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 @@ | |||
23 | #include <mach/portmux.h> | 23 | #include <mach/portmux.h> |
24 | #include <mach/board.h> | 24 | #include <mach/board.h> |
25 | 25 | ||
26 | #include <sound/atmel-ac97c.h> | ||
27 | |||
26 | static struct ac97c_platform_data __initdata ac97c0_data = { | 28 | static struct ac97c_platform_data __initdata ac97c0_data = { |
27 | .dma_rx_periph_id = 3, | 29 | .reset_pin = GPIO_PIN_PB(19), |
28 | .dma_tx_periph_id = 4, | ||
29 | .dma_controller_id = 0, | ||
30 | .reset_pin = GPIO_PIN_PB(19), | ||
31 | }; | 30 | }; |
32 | 31 | ||
33 | #ifdef CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA | 32 | #ifdef CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA |
@@ -167,7 +166,7 @@ static int __init atevklcd10x_init(void) | |||
167 | fbmem_start, fbmem_size, | 166 | fbmem_start, fbmem_size, |
168 | ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL); | 167 | ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL); |
169 | 168 | ||
170 | at32_add_device_ac97c(0, &ac97c0_data); | 169 | at32_add_device_ac97c(0, &ac97c0_data, AC97C_BOTH); |
171 | 170 | ||
172 | return 0; | 171 | return 0; |
173 | } | 172 | } |
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 @@ | |||
29 | #include <mach/init.h> | 29 | #include <mach/init.h> |
30 | #include <mach/portmux.h> | 30 | #include <mach/portmux.h> |
31 | 31 | ||
32 | #include <sound/atmel-ac97c.h> | ||
33 | |||
32 | #include "../../mach-at32ap/clock.h" | 34 | #include "../../mach-at32ap/clock.h" |
33 | #include "flash.h" | 35 | #include "flash.h" |
34 | 36 | ||
@@ -233,7 +235,7 @@ static int __init hammerhead_init(void) | |||
233 | i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info)); | 235 | i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info)); |
234 | 236 | ||
235 | #ifdef CONFIG_BOARD_HAMMERHEAD_SND | 237 | #ifdef CONFIG_BOARD_HAMMERHEAD_SND |
236 | at32_add_device_ac97c(0, &ac97c_data); | 238 | at32_add_device_ac97c(0, &ac97c_data, AC97C_BOTH); |
237 | #endif | 239 | #endif |
238 | 240 | ||
239 | /* Select the Touchscreen interrupt pin mode */ | 241 | /* Select the Touchscreen interrupt pin mode */ |