diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-20 23:04:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-20 23:04:40 -0800 |
| commit | fbac7d7d6c1f873c89d88ca6ab8a2891ac837796 (patch) | |
| tree | 7e5a205ff54f6a7416ffe3b5aad646092f78bee2 | |
| parent | 8a6ff8a0a2bc51b29681aab093b349c9eb32acf5 (diff) | |
| parent | 2abb74eaf6e73cb42e87bdc9e9c2535ce485e614 (diff) | |
| download | blackbird-op-linux-fbac7d7d6c1f873c89d88ca6ab8a2891ac837796.tar.gz blackbird-op-linux-fbac7d7d6c1f873c89d88ca6ab8a2891ac837796.zip | |
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
| -rw-r--r-- | arch/arm/mach-at91/include/mach/hardware.h | 3 | ||||
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/board.h | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/atmel.h | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index 711a7892d331..a832e0707611 100644 --- 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 index dca93450cb0e..d485b0391357 100644 --- 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 index dbd6d53cc270..6a293b7fff3b 100644 --- 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 */ |
