Skip to content

Commit

Permalink
Blackfin: add serial TX IRQ in individual platform resource
Browse files Browse the repository at this point in the history 
The serial TX IRQ is not simply (RX IRQ + 1) on some Blackfin chips,
so move the values to the platform resources.

Signed-off-by: Sonic Zhang <[email protected]>
Signed-off-by: Mike Frysinger <[email protected]>
Signed-off-by: Bob Liu <[email protected]>
  • Loading branch information
@sonicz @aet00
sonicz authored and aet00 committed Nov 14, 2011
1 parent 7f80850 commit edb0a64
Show file tree
Hide file tree
Showing 28 changed files with 296 additions and 49 deletions.
2 changes: 2 additions & 0 deletions arch/blackfin/include/asm/bfin_serial.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ struct work_struct;
struct bfin_serial_port {
struct uart_port port;
unsigned int old_status;
int tx_irq;
int rx_irq;
int status_irq;
#ifndef BFIN_UART_BF54X_STYLE
unsigned int lsr;
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf518/boards/ezbrd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -415,9 +420,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf518/boards/tcm-bf518.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -351,9 +356,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf527/boards/ad7160eval.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -423,9 +428,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf527/boards/cm_bf527.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -581,9 +586,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf527/boards/ezbrd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -459,9 +464,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf527/boards/ezkit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,9 +710,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -753,9 +758,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf527/boards/tll6527m.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -539,9 +544,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
7 changes: 6 additions & 1 deletion arch/blackfin/mach-bf533/boards/H8606.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
7 changes: 6 additions & 1 deletion arch/blackfin/mach-bf533/boards/blackstamp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
7 changes: 6 additions & 1 deletion arch/blackfin/mach-bf533/boards/cm_bf533.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
7 changes: 6 additions & 1 deletion arch/blackfin/mach-bf533/boards/ezkit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
7 changes: 6 additions & 1 deletion arch/blackfin/mach-bf533/boards/ip0x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
7 changes: 6 additions & 1 deletion arch/blackfin/mach-bf533/boards/stamp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,14 @@ static struct resource bfin_uart0_resources[] = {
.end = BFIN_UART_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX + 1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf537/boards/cm_bf537e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -365,9 +370,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
14 changes: 12 additions & 2 deletions arch/blackfin/mach-bf537/boards/cm_bf537u.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,14 @@ static struct resource bfin_uart0_resources[] = {
.end = UART0_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART0_TX,
.end = IRQ_UART0_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART0_RX,
.end = IRQ_UART0_RX+1,
.end = IRQ_UART0_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down Expand Up @@ -348,9 +353,14 @@ static struct resource bfin_uart1_resources[] = {
.end = UART1_GCTL+2,
.flags = IORESOURCE_MEM,
},
{
.start = IRQ_UART1_TX,
.end = IRQ_UART1_TX,
.flags = IORESOURCE_IRQ,
},
{
.start = IRQ_UART1_RX,
.end = IRQ_UART1_RX+1,
.end = IRQ_UART1_RX,
.flags = IORESOURCE_IRQ,
},
{
Expand Down
Loading

0 comments on commit edb0a64

Please sign in to comment.