2 files changed, 54 insertions, 22 deletions

diff --git a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
index 5c4c971eed8e..b9222bf895bc 100644
--- a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
+++ b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
@@ -171,25 +171,49 @@
                 ATMEL_LCDC(PE, DATA20) | ATMEL_LCDC(PE, DATA21) |       \
                 ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23))
 
-#define ATMEL_LCDC_PRI_15B_DATA (                                       \
-                ATMEL_LCDC(PC, DATA0)  | ATMEL_LCDC(PC, DATA1)  |       \
+#define ATMEL_LCDC_PRI_18B_DATA (                                       \
                 ATMEL_LCDC(PC, DATA2)  | ATMEL_LCDC(PC, DATA3)  |       \
                 ATMEL_LCDC(PC, DATA4)  | ATMEL_LCDC(PC, DATA5)  |       \
-                ATMEL_LCDC(PD, DATA8)  | ATMEL_LCDC(PD, DATA9)  |       \
+                ATMEL_LCDC(PD, DATA6)  | ATMEL_LCDC(PD, DATA7)  |       \
                 ATMEL_LCDC(PD, DATA10) | ATMEL_LCDC(PD, DATA11) |       \
-                ATMEL_LCDC(PD, DATA12) | ATMEL_LCDC(PD, DATA16) |       \
-                ATMEL_LCDC(PD, DATA17) | ATMEL_LCDC(PD, DATA18) |       \
-                ATMEL_LCDC(PD, DATA19) | ATMEL_LCDC(PD, DATA20))
+                ATMEL_LCDC(PD, DATA12) | ATMEL_LCDC(PD, DATA13) |       \
+                ATMEL_LCDC(PD, DATA14) | ATMEL_LCDC(PD, DATA15) |       \
+                ATMEL_LCDC(PD, DATA18) | ATMEL_LCDC(PD, DATA19) |       \
+                ATMEL_LCDC(PD, DATA20) | ATMEL_LCDC(PD, DATA21) |       \
+                ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23))
 
-#define ATMEL_LCDC_ALT_15B_DATA (                                       \
-                ATMEL_LCDC(PE, DATA0)  | ATMEL_LCDC(PE, DATA1)  |       \
+#define ATMEL_LCDC_ALT_18B_DATA (                                       \
                 ATMEL_LCDC(PE, DATA2)  | ATMEL_LCDC(PE, DATA3)  |       \
                 ATMEL_LCDC(PE, DATA4)  | ATMEL_LCDC(PC, DATA5)  |       \
-                ATMEL_LCDC(PE, DATA8)  | ATMEL_LCDC(PE, DATA9)  |       \
+                ATMEL_LCDC(PD, DATA6)  | ATMEL_LCDC(PD, DATA7)  |       \
                 ATMEL_LCDC(PE, DATA10) | ATMEL_LCDC(PE, DATA11) |       \
-                ATMEL_LCDC(PE, DATA12) | ATMEL_LCDC(PE, DATA16) |       \
-                ATMEL_LCDC(PE, DATA17) | ATMEL_LCDC(PE, DATA18) |       \
-                ATMEL_LCDC(PE, DATA19) | ATMEL_LCDC(PE, DATA20))
+                ATMEL_LCDC(PE, DATA12) | ATMEL_LCDC(PD, DATA13) |       \
+                ATMEL_LCDC(PD, DATA14) | ATMEL_LCDC(PD, DATA15) |       \
+                ATMEL_LCDC(PE, DATA18) | ATMEL_LCDC(PE, DATA19) |       \
+                ATMEL_LCDC(PE, DATA20) | ATMEL_LCDC(PE, DATA21) |       \
+                ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23))
+
+#define ATMEL_LCDC_PRI_15B_DATA (                                       \
+                ATMEL_LCDC(PC, DATA3)  | ATMEL_LCDC(PC, DATA4)  |       \
+                ATMEL_LCDC(PC, DATA5)  | ATMEL_LCDC(PD, DATA6)  |       \
+                ATMEL_LCDC(PD, DATA7)  |                                \
+                ATMEL_LCDC(PD, DATA11) | ATMEL_LCDC(PD, DATA12) |       \
+                ATMEL_LCDC(PD, DATA13) | ATMEL_LCDC(PD, DATA14) |       \
+                ATMEL_LCDC(PD, DATA15) |                                \
+                ATMEL_LCDC(PD, DATA19) | ATMEL_LCDC(PD, DATA20) |       \
+                ATMEL_LCDC(PD, DATA21) | ATMEL_LCDC(PD, DATA22) |       \
+                ATMEL_LCDC(PD, DATA23))
+
+#define ATMEL_LCDC_ALT_15B_DATA (                                       \
+                ATMEL_LCDC(PE, DATA3)  | ATMEL_LCDC(PE, DATA4)  |       \
+                ATMEL_LCDC(PC, DATA5)  | ATMEL_LCDC(PD, DATA6)  |       \
+                ATMEL_LCDC(PD, DATA7)  |                                \
+                ATMEL_LCDC(PE, DATA11) | ATMEL_LCDC(PE, DATA12) |       \
+                ATMEL_LCDC(PD, DATA13) | ATMEL_LCDC(PD, DATA14) |       \
+                ATMEL_LCDC(PD, DATA15) |                                \
+                ATMEL_LCDC(PE, DATA19) | ATMEL_LCDC(PE, DATA20) |       \
+                ATMEL_LCDC(PE, DATA21) | ATMEL_LCDC(PD, DATA22) |       \
+                ATMEL_LCDC(PD, DATA23))
 
 #define ATMEL_LCDC_PRI_CONTROL (                                        \
                 ATMEL_LCDC(PC, CC)   | ATMEL_LCDC(PC, DVAL) |           \
@@ -207,6 +231,10 @@
 
 #define ATMEL_LCDC_ALT_24BIT    (ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_24B_DATA)
 
+#define ATMEL_LCDC_PRI_18BIT    (ATMEL_LCDC_CONTROL | ATMEL_LCDC_PRI_18B_DATA)
+
+#define ATMEL_LCDC_ALT_18BIT    (ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_18B_DATA)
+
 #define ATMEL_LCDC_PRI_15BIT    (ATMEL_LCDC_CONTROL | ATMEL_LCDC_PRI_15B_DATA)
 
 #define ATMEL_LCDC_ALT_15BIT    (ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_15B_DATA)
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index cff8e84f78f2..0b8164281899 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -13,7 +13,7 @@
  * in this array is chip-dependent.
  */
 extern unsigned long at32_board_osc_rates[];
-  
+
 /*
  * This used to add essential system devices, but this is now done
  * automatically. Please don't use it in new board code.
@@ -26,12 +26,17 @@ static inline void __deprecated at32_add_system_devices(void)
 #define ATMEL_MAX_UART  4
 extern struct platform_device *atmel_default_console_device;
 
+/* Flags for selecting USART extra pins */
+#define ATMEL_USART_RTS         0x01
+#define ATMEL_USART_CTS         0x02
+#define ATMEL_USART_CLK         0x03
+
 struct atmel_uart_data {
         short           use_dma_tx;     /* use transmit DMA? */
         short           use_dma_rx;     /* use receive DMA? */
         void __iomem    *regs;          /* virtual base address, if any */
 };
-void at32_map_usart(unsigned int hw_id, unsigned int line);
+void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);
 struct platform_device *at32_add_device_usart(unsigned int id);
 
 struct eth_platform_data {
@@ -88,16 +93,15 @@ struct mci_platform_data;
 struct platform_device *
 at32_add_device_mci(unsigned int id, struct mci_platform_data *data);
 
-struct ac97c_platform_data {
-        unsigned short dma_rx_periph_id;
-        unsigned short dma_tx_periph_id;
-        unsigned short dma_controller_id;
-        int reset_pin;
-};
+struct ac97c_platform_data;
+struct platform_device *
+at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
+                      unsigned int flags);
+
+struct atmel_abdac_pdata;
 struct platform_device *
-at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data);
+at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data);
 
-struct platform_device *at32_add_device_abdac(unsigned int id);
 struct platform_device *at32_add_device_psif(unsigned int id);
 
 struct cf_platform_data {