Skip to content

L
linux-davinci
Commit 42bd8bcb authored by Graf Yang's avatar Graf Yang Committed by Bryan Wu
Browse files
Options

Blackfin arch: Modify bfin_sir device configuration to board file 

Signed-off-by: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent c0948d33
Hide whitespace changes
Inline Side-by-side
Showing with 882 additions and 147 deletions
arch/blackfin/mach-bf518/boards/ezbrd.c
View file @ 42bd8bcb
...@@ -396,30 +396,59 @@ static struct platform_device bfin_uart_device = { ...@@ -396,30 +396,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -550,7 +579,12 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -550,7 +579,12 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf527/boards/cm_bf527.c
View file @ 42bd8bcb
...@@ -717,30 +717,59 @@ static struct platform_device bfin_uart_device = { ...@@ -717,30 +717,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -911,7 +940,12 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -911,7 +940,12 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf527/boards/ezbrd.c
View file @ 42bd8bcb
...@@ -478,30 +478,59 @@ static struct platform_device bfin_uart_device = { ...@@ -478,30 +478,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -671,7 +700,12 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -671,7 +700,12 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf527/boards/ezkit.c
View file @ 42bd8bcb
...@@ -718,30 +718,59 @@ static struct platform_device bfin_uart_device = { ...@@ -718,30 +718,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -951,7 +980,12 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -951,7 +980,12 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf533/boards/H8606.c
View file @ 42bd8bcb
...@@ -313,23 +313,33 @@ static struct platform_device bfin_uart_device = { ...@@ -313,23 +313,33 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir0_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir_resources, .resource = bfin_sir0_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
...@@ -431,7 +441,9 @@ static struct platform_device *h8606_devices[] __initdata = { ...@@ -431,7 +441,9 @@ static struct platform_device *h8606_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif #endif
#if defined(CONFIG_KEYBOARD_OPENCORES) || defined(CONFIG_KEYBOARD_OPENCORES_MODULE) #if defined(CONFIG_KEYBOARD_OPENCORES) || defined(CONFIG_KEYBOARD_OPENCORES_MODULE)
......
arch/blackfin/mach-bf533/boards/blackstamp.c
View file @ 42bd8bcb
...@@ -212,23 +212,33 @@ static struct platform_device bfin_uart_device = { ...@@ -212,23 +212,33 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir0_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir_resources, .resource = bfin_sir0_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
static struct platform_device bfin_sport0_uart_device = { static struct platform_device bfin_sport0_uart_device = {
...@@ -353,7 +363,9 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -353,7 +363,9 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif #endif
#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
......
arch/blackfin/mach-bf533/boards/cm_bf533.c
View file @ 42bd8bcb
...@@ -250,23 +250,33 @@ static struct platform_device bfin_uart_device = { ...@@ -250,23 +250,33 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir0_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir_resources, .resource = bfin_sir0_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
static struct platform_device bfin_sport0_uart_device = { static struct platform_device bfin_sport0_uart_device = {
...@@ -355,7 +365,9 @@ static struct platform_device *cm_bf533_devices[] __initdata = { ...@@ -355,7 +365,9 @@ static struct platform_device *cm_bf533_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif #endif
#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
......
arch/blackfin/mach-bf533/boards/ezkit.c
View file @ 42bd8bcb
...@@ -236,23 +236,33 @@ static struct platform_device bfin_uart_device = { ...@@ -236,23 +236,33 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir0_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir_resources, .resource = bfin_sir0_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
#include <linux/input.h> #include <linux/input.h>
...@@ -358,12 +368,10 @@ static struct platform_device *ezkit_devices[] __initdata = { ...@@ -358,12 +368,10 @@ static struct platform_device *ezkit_devices[] __initdata = {
&rtc_device, &rtc_device,
#endif #endif
#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
&bfin_uart_device,
#endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif #endif
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
......
arch/blackfin/mach-bf533/boards/generic_board.c
View file @ 42bd8bcb
...@@ -72,6 +72,35 @@ static struct platform_device smc91x_device = { ...@@ -72,6 +72,35 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
#ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{
.start = 0xFFC00400,
.end = 0xFFC004FF,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif
#endif
static struct platform_device *generic_board_devices[] __initdata = { static struct platform_device *generic_board_devices[] __initdata = {
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
&rtc_device, &rtc_device,
...@@ -80,6 +109,12 @@ static struct platform_device *generic_board_devices[] __initdata = { ...@@ -80,6 +109,12 @@ static struct platform_device *generic_board_devices[] __initdata = {
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
&smc91x_device, &smc91x_device,
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
#ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif
}; };
static int __init generic_board_init(void) static int __init generic_board_init(void)
......
arch/blackfin/mach-bf533/boards/ip0x.c
View file @ 42bd8bcb
...@@ -197,23 +197,33 @@ static struct platform_device bfin_uart_device = { ...@@ -197,23 +197,33 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir0_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir_resources, .resource = bfin_sir0_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
static struct resource isp1362_hcd_resources[] = { static struct resource isp1362_hcd_resources[] = {
...@@ -272,7 +282,9 @@ static struct platform_device *ip0x_devices[] __initdata = { ...@@ -272,7 +282,9 @@ static struct platform_device *ip0x_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
......
arch/blackfin/mach-bf533/boards/stamp.c
View file @ 42bd8bcb
...@@ -345,23 +345,33 @@ static struct platform_device bfin_uart_device = { ...@@ -345,23 +345,33 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir0_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir_resources, .resource = bfin_sir0_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
static struct platform_device bfin_sport0_uart_device = { static struct platform_device bfin_sport0_uart_device = {
...@@ -509,7 +519,9 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -509,7 +519,9 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif #endif
#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
......
arch/blackfin/mach-bf537/boards/cm_bf537.c
View file @ 42bd8bcb
...@@ -392,30 +392,57 @@ static struct platform_device bfin_uart_device = { ...@@ -392,30 +392,57 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir1_device = {
static struct platform_device bfin_sir_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -538,7 +565,12 @@ static struct platform_device *cm_bf537_devices[] __initdata = { ...@@ -538,7 +565,12 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf537/boards/generic_board.c
View file @ 42bd8bcb
...@@ -548,30 +548,59 @@ static struct platform_device bfin_uart_device = { ...@@ -548,30 +548,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -661,7 +690,12 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -661,7 +690,12 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf537/boards/minotaur.c
View file @ 42bd8bcb
...@@ -226,30 +226,59 @@ static struct platform_device bfin_uart_device = { ...@@ -226,30 +226,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -311,7 +340,12 @@ static struct platform_device *minotaur_devices[] __initdata = { ...@@ -311,7 +340,12 @@ static struct platform_device *minotaur_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf537/boards/pnav10.c
View file @ 42bd8bcb
...@@ -453,30 +453,59 @@ static struct platform_device bfin_uart_device = { ...@@ -453,30 +453,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
static struct platform_device *stamp_devices[] __initdata = { static struct platform_device *stamp_devices[] __initdata = {
#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
...@@ -520,7 +549,12 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -520,7 +549,12 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
}; };
......
arch/blackfin/mach-bf537/boards/stamp.c
View file @ 42bd8bcb
...@@ -905,30 +905,59 @@ static struct platform_device bfin_uart_device = { ...@@ -905,30 +905,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -1216,7 +1245,12 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -1216,7 +1245,12 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf537/boards/tcm_bf537.c
View file @ 42bd8bcb
...@@ -392,30 +392,59 @@ static struct platform_device bfin_uart_device = { ...@@ -392,30 +392,59 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir1_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 1,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir_resources, .resource = bfin_sir1_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
static struct resource bfin_twi0_resource[] = { static struct resource bfin_twi0_resource[] = {
...@@ -538,7 +567,12 @@ static struct platform_device *cm_bf537_devices[] __initdata = { ...@@ -538,7 +567,12 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#endif #endif
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
......
arch/blackfin/mach-bf538/boards/ezkit.c
View file @ 42bd8bcb
...@@ -95,37 +95,82 @@ static struct platform_device bfin_uart_device = { ...@@ -95,37 +95,82 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir1_device = {
.name = "bfin_sir",
.id = 1,
.num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir1_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR2 #ifdef CONFIG_BFIN_SIR2
static struct resource bfin_sir2_resources[] = {
{ {
.start = 0xFFC02100, .start = 0xFFC02100,
.end = 0xFFC021FF, .end = 0xFFC021FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART2_RX,
.end = IRQ_UART2_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART2_RX,
.end = CH_UART2_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir2_device = {
static struct platform_device bfin_sir_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 2,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir2_resources),
.resource = bfin_sir_resources, .resource = bfin_sir2_resources,
}; };
#endif #endif
#endif
/* /*
* USB-LAN EzExtender board * USB-LAN EzExtender board
...@@ -519,7 +564,15 @@ static struct platform_device *cm_bf538_devices[] __initdata = { ...@@ -519,7 +564,15 @@ static struct platform_device *cm_bf538_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#ifdef CONFIG_BFIN_SIR2
&bfin_sir2_device,
#endif
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
......
arch/blackfin/mach-bf548/boards/cm_bf548.c
View file @ 42bd8bcb
...@@ -187,44 +187,107 @@ static struct platform_device bfin_uart_device = { ...@@ -187,44 +187,107 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir1_device = {
.name = "bfin_sir",
.id = 1,
.num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir1_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR2 #ifdef CONFIG_BFIN_SIR2
static struct resource bfin_sir2_resources[] = {
{ {
.start = 0xFFC02100, .start = 0xFFC02100,
.end = 0xFFC021FF, .end = 0xFFC021FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART2_RX,
.end = IRQ_UART2_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART2_RX,
.end = CH_UART2_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir2_device = {
.name = "bfin_sir",
.id = 2,
.num_resources = ARRAY_SIZE(bfin_sir2_resources),
.resource = bfin_sir2_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR3 #ifdef CONFIG_BFIN_SIR3
static struct resource bfin_sir3_resources[] = {
{ {
.start = 0xFFC03100, .start = 0xFFC03100,
.end = 0xFFC031FF, .end = 0xFFC031FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART3_RX,
.end = IRQ_UART3_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART3_RX,
.end = CH_UART3_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir3_device = {
static struct platform_device bfin_sir_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 3,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir3_resources),
.resource = bfin_sir_resources, .resource = bfin_sir3_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
static struct resource smsc911x_resources[] = { static struct resource smsc911x_resources[] = {
...@@ -696,7 +759,18 @@ static struct platform_device *cm_bf548_devices[] __initdata = { ...@@ -696,7 +759,18 @@ static struct platform_device *cm_bf548_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#ifdef CONFIG_BFIN_SIR2
&bfin_sir2_device,
#endif
#ifdef CONFIG_BFIN_SIR3
&bfin_sir3_device,
#endif
#endif #endif
#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
......
arch/blackfin/mach-bf548/boards/ezkit.c
View file @ 42bd8bcb
...@@ -255,44 +255,107 @@ static struct platform_device bfin_uart_device = { ...@@ -255,44 +255,107 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
static struct resource bfin_sir1_resources[] = {
{ {
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART1_RX,
.end = CH_UART1_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir1_device = {
.name = "bfin_sir",
.id = 1,
.num_resources = ARRAY_SIZE(bfin_sir1_resources),
.resource = bfin_sir1_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR2 #ifdef CONFIG_BFIN_SIR2
static struct resource bfin_sir2_resources[] = {
{ {
.start = 0xFFC02100, .start = 0xFFC02100,
.end = 0xFFC021FF, .end = 0xFFC021FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
{
.start = IRQ_UART2_RX,
.end = IRQ_UART2_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART2_RX,
.end = CH_UART2_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir2_device = {
.name = "bfin_sir",
.id = 2,
.num_resources = ARRAY_SIZE(bfin_sir2_resources),
.resource = bfin_sir2_resources,
};
#endif #endif
#ifdef CONFIG_BFIN_SIR3 #ifdef CONFIG_BFIN_SIR3
static struct resource bfin_sir3_resources[] = {
{ {
.start = 0xFFC03100, .start = 0xFFC03100,
.end = 0xFFC031FF, .end = 0xFFC031FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART3_RX,
.end = IRQ_UART3_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART3_RX,
.end = CH_UART3_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir3_device = {
static struct platform_device bfin_sir_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 3,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir3_resources),
.resource = bfin_sir_resources, .resource = bfin_sir3_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
static struct resource smsc911x_resources[] = { static struct resource smsc911x_resources[] = {
...@@ -805,7 +868,18 @@ static struct platform_device *ezkit_devices[] __initdata = { ...@@ -805,7 +868,18 @@ static struct platform_device *ezkit_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#ifdef CONFIG_BFIN_SIR1
&bfin_sir1_device,
#endif
#ifdef CONFIG_BFIN_SIR2
&bfin_sir2_device,
#endif
#ifdef CONFIG_BFIN_SIR3
&bfin_sir3_device,
#endif
#endif #endif
#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
......
arch/blackfin/mach-bf561/boards/cm_bf561.c
View file @ 42bd8bcb
...@@ -300,23 +300,33 @@ static struct platform_device bfin_uart_device = { ...@@ -300,23 +300,33 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir0_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir_resources, .resource = bfin_sir0_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
#define PATA_INT IRQ_PF46 #define PATA_INT IRQ_PF46
...@@ -395,7 +405,9 @@ static struct platform_device *cm_bf561_devices[] __initdata = { ...@@ -395,7 +405,9 @@ static struct platform_device *cm_bf561_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
......
arch/blackfin/mach-bf561/boards/ezkit.c
View file @ 42bd8bcb
...@@ -210,23 +210,33 @@ static struct platform_device bfin_uart_device = { ...@@ -210,23 +210,33 @@ static struct platform_device bfin_uart_device = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
static struct resource bfin_sir_resources[] = {
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif {
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
}; };
static struct platform_device bfin_sir_device = { static struct platform_device bfin_sir0_device = {
.name = "bfin_sir", .name = "bfin_sir",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(bfin_sir_resources), .num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir_resources, .resource = bfin_sir0_resources,
}; };
#endif #endif
#endif
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
static struct mtd_partition ezkit_partitions[] = { static struct mtd_partition ezkit_partitions[] = {
...@@ -451,7 +461,9 @@ static struct platform_device *ezkit_devices[] __initdata = { ...@@ -451,7 +461,9 @@ static struct platform_device *ezkit_devices[] __initdata = {
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
&bfin_sir_device, #ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif #endif
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
......
arch/blackfin/mach-bf561/boards/generic_board.c
View file @ 42bd8bcb
...@@ -62,10 +62,45 @@ static struct platform_device smc91x_device = { ...@@ -62,10 +62,45 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
#ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{
.start = 0xFFC00400,
.end = 0xFFC004FF,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif
#endif
static struct platform_device *generic_board_devices[] __initdata = { static struct platform_device *generic_board_devices[] __initdata = {
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
&smc91x_device, &smc91x_device,
#endif #endif
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
#ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif
}; };
static int __init generic_board_init(void) static int __init generic_board_init(void)
......
arch/blackfin/mach-bf561/boards/tepla.c
View file @ 42bd8bcb
...@@ -44,8 +44,42 @@ static struct platform_device smc91x_device = { ...@@ -44,8 +44,42 @@ static struct platform_device smc91x_device = {
.resource = smc91x_resources, .resource = smc91x_resources,
}; };
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
#ifdef CONFIG_BFIN_SIR0
static struct resource bfin_sir0_resources[] = {
{
.start = 0xFFC00400,
.end = 0xFFC004FF,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.flags = IORESOURCE_IRQ,
},
{
.start = CH_UART0_RX,
.end = CH_UART0_RX+1,
.flags = IORESOURCE_DMA,
},
};
static struct platform_device bfin_sir0_device = {
.name = "bfin_sir",
.id = 0,
.num_resources = ARRAY_SIZE(bfin_sir0_resources),
.resource = bfin_sir0_resources,
};
#endif
#endif
static struct platform_device *tepla_devices[] __initdata = { static struct platform_device *tepla_devices[] __initdata = {
&smc91x_device, &smc91x_device,
#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
#ifdef CONFIG_BFIN_SIR0
&bfin_sir0_device,
#endif
#endif
}; };
static int __init tepla_init(void) static int __init tepla_init(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment