Merge branch 'efm32/cleanup' into next/dt

Dependency for efm32/dt branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:14:10 +01:00
parent c5d326c22b d5d5ce952a
commit 8d445234dc
77 changed files with 153 additions and 742 deletions
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -84,6 +84,7 @@ struct atmel_uart_data {
 	short			use_dma_rx;	/* use receive DMA? */
 	void __iomem		*regs;		/* virt. base address, if any */
 	struct serial_rs485	rs485;		/* rs485 settings */
+	int			rts_gpio;	/* optional RTS GPIO */
 };

 /* Touchscreen Controller */