openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-11-17 23:05:06 +01:00 committed by Nicolas Ferre
parent 75984df05d
commit 2abb74eaf6
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-at91/include/mach/hardware.h
View File

@ -90,9 +90,6 @@
#define AT91_SRAM_MAX SZ_1M #define AT91_SRAM_MAX SZ_1M
#define AT91_VIRT_BASE (AT91_IO_VIRT_BASE - AT91_SRAM_MAX) #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 */ /* External Memory Map */
#define AT91_CHIPSELECT_0 0x10000000 #define AT91_CHIPSELECT_0 0x10000000
#define AT91_CHIPSELECT_1 0x20000000 #define AT91_CHIPSELECT_1 0x20000000

1
arch/avr32/mach-at32ap/include/mach/board.h
View File

@ -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; extern struct platform_device *atmel_default_console_device;
/* Flags for selecting USART extra pins */ /* Flags for selecting USART extra pins */

6
include/linux/platform_data/atmel.h
View File

@ -19,6 +19,12 @@
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/platform_data/macb.h> #include <linux/platform_data/macb.h>
/*
* at91: 6 USARTs and one DBGU port (SAM9260)
* avr32: 4
*/
#define ATMEL_MAX_UART 7
/* USB Device */ /* USB Device */
struct at91_udc_data { struct at91_udc_data {
int vbus_pin; /* high == host powering us */ int vbus_pin; /* high == host powering us */