Merge tag 'at91-header' of git://github.com/at91linux/linux-at91 into next/headers

From Nicolas Ferre: One fix related to UART for the "headers move" branch * tag 'at91-header' of git://github.com/at91linux/linux-at91: atmel: move ATMEL_MAX_UART to platform_data/atmel.h
2012-11-20 23:04:40 -08:00
parent 8a6ff8a0a2 2abb74eaf6
commit fbac7d7d6c
3 changed files with 6 additions and 4 deletions
@@ -90,9 +90,6 @@
 #define AT91_SRAM_MAX		SZ_1M
 #define AT91_VIRT_BASE		(AT91_IO_VIRT_BASE - AT91_SRAM_MAX)

-/* Serial ports */
-#define ATMEL_MAX_UART		7		/* 6 USART3's and one DBGU port (SAM9260) */
-
 /* External Memory Map */
 #define AT91_CHIPSELECT_0	0x10000000
 #define AT91_CHIPSELECT_1	0x20000000
@@ -26,7 +26,6 @@ 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 */
@@ -19,6 +19,12 @@
 #include <linux/serial.h>
 #include <linux/platform_data/macb.h>

+/*
+ * at91: 6 USARTs and one DBGU port (SAM9260)
+ * avr32: 4
+ */
+#define ATMEL_MAX_UART	7
+
 /* USB Device */
 struct at91_udc_data {
 	int	vbus_pin;		/* high == host powering us */