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
git-mirror · Nov 21, 2012 · fbac7d7 · fbac7d7
2 parents 8a6ff8a + 2abb74e
commit fbac7d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
@@ -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

diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -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 */

diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
@@ -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 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 */
@@ Expand Down @@