Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2abb74ea authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

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: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 75984df0

arch/arm/mach-at91/include/mach/hardware.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -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

arch/avr32/mach-at32ap/include/mach/board.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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 */

include/linux/platform_data/atmel.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -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 */