Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

[pandora-kernel.git] / arch / avr32 / boards / favr-32 / setup.c

diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index 745c408..75f19f4 100644 (file)
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -22,6 +22,8 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
+#include <sound/atmel-abdac.h>
+
 #include <video/atmel_lcdc.h>
 
 #include <asm/setup.h>
@@ -41,6 +43,9 @@ unsigned long at32_board_osc_rates[3] = {
 /* Initialized by bootloader-specific startup code. */
 struct tag *bootloader_tags __initdata;
 
+static struct atmel_abdac_pdata __initdata abdac0_data = {
+};
+
 struct eth_addr {
        u8 addr[6];
 };
@@ -67,6 +72,10 @@ static struct ads7846_platform_data ads7843_data = {
        .debounce_max           = 20,
        .debounce_rep           = 4,
        .debounce_tol           = 5,
+
+       .keep_vref_on           = true,
+       .settle_delay_usecs     = 500,
+       .penirq_recheck_delay_usecs = 100,
 };
 
 static struct spi_board_info __initdata spi1_board_info[] = {
@@ -245,7 +254,7 @@ static void __init favr32_setup_atmel_pwm_bl(void)
 
 void __init setup_board(void)
 {
-       at32_map_usart(3, 0);   /* USART 3 => /dev/ttyS0 */
+       at32_map_usart(3, 0, 0);        /* USART 3 => /dev/ttyS0 */
        at32_setup_serial_console(0);
 }
 
@@ -326,7 +335,7 @@ static int __init favr32_init(void)
 
        spi1_board_info[0].irq = gpio_to_irq(GPIO_PIN_PB(3));
 
-       set_abdac_rate(at32_add_device_abdac(0));
+       set_abdac_rate(at32_add_device_abdac(0, &abdac0_data));
 
        at32_add_device_pwm(1 << atmel_pwm_bl_pdata.pwm_channel);
        at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));