Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

atmel: move ATMEL_MAX_UART to platform_data/atmel.h

Modify both AT91 and AVR32 platforms.
Use 7 for it as the sam9260 or the sam9g25 have 7 of them DBGU included.

Reported-by: Joachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

authored by

Jean-Christophe PLAGNIOL-VILLARD and committed by
Nicolas Ferre
2abb74ea 75984df0

+6 -4
-3
arch/arm/mach-at91/include/mach/hardware.h
··· 90 90 #define AT91_SRAM_MAX SZ_1M 91 91 #define AT91_VIRT_BASE (AT91_IO_VIRT_BASE - AT91_SRAM_MAX) 92 92 93 - /* Serial ports */ 94 - #define ATMEL_MAX_UART 7 /* 6 USART3's and one DBGU port (SAM9260) */ 95 - 96 93 /* External Memory Map */ 97 94 #define AT91_CHIPSELECT_0 0x10000000 98 95 #define AT91_CHIPSELECT_1 0x20000000
-1
arch/avr32/mach-at32ap/include/mach/board.h
··· 26 26 27 27 } 28 28 29 - #define ATMEL_MAX_UART 4 30 29 extern struct platform_device *atmel_default_console_device; 31 30 32 31 /* Flags for selecting USART extra pins */
+6
include/linux/platform_data/atmel.h
··· 19 19 #include <linux/serial.h> 20 20 #include <linux/platform_data/macb.h> 21 21 22 + /* 23 + * at91: 6 USARTs and one DBGU port (SAM9260) 24 + * avr32: 4 25 + */ 26 + #define ATMEL_MAX_UART 7 27 + 22 28 /* USB Device */ 23 29 struct at91_udc_data { 24 30 int vbus_pin; /* high == host powering us */