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

Commit c30c8f9f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

parents 45ff6fa1 dd0b3825

arch/arm/mach-at91/at91cap9_devices.c

+3 −4
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB HS Device (Gadget)

 * -------------------------------------------------------------------- */



#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)

#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)



static struct resource usba_udc_resources[] = {

	[0] = {
@@ -1021,8 +1021,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -1035,7 +1035,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);

arch/arm/mach-at91/at91rm9200_devices.c

+2 −3
Original line number Diff line number Diff line
@@ -877,8 +877,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -891,7 +891,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);

arch/arm/mach-at91/at91sam9260_devices.c

+2 −3
Original line number Diff line number Diff line
@@ -837,8 +837,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -851,7 +851,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);

arch/arm/mach-at91/at91sam9261_devices.c

+2 −3
Original line number Diff line number Diff line
@@ -816,8 +816,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 
#if defined(CONFIG_SERIAL_ATMEL)

static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -830,7 +830,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);

arch/arm/mach-at91/at91sam9263_devices.c

+2 −3
Original line number Diff line number Diff line
@@ -1196,8 +1196,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} 


static struct resource dbgu_resources[] = {

	[0] = {

		.start	= AT91_VA_BASE_SYS + AT91_DBGU,

		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.start	= AT91_BASE_SYS + AT91_DBGU,

		.end	= AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -1210,7 +1210,6 @@ static struct resource dbgu_resources[] = { 
static struct atmel_uart_data dbgu_data = {

	.use_dma_tx	= 0,

	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */

	.regs		= (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),

};



static u64 dbgu_dmamask = DMA_BIT_MASK(32);