diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 15:47:41 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 15:47:41 -0500 |
commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
tree | bc16200f3b6ea150b298422754e32959eaa339bc /arch/blackfin/mach-bf538 | |
parent | 951c486f62490e032da0ad17e93270b0cfb6687f (diff) | |
parent | 0116da4fcc1ae8a80d9002441e98768f2a6fa2fe (diff) |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'arch/blackfin/mach-bf538')
-rw-r--r-- | arch/blackfin/mach-bf538/boards/ezkit.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c b/arch/blackfin/mach-bf538/boards/ezkit.c index 629f3c333415..8356eb599f19 100644 --- a/arch/blackfin/mach-bf538/boards/ezkit.c +++ b/arch/blackfin/mach-bf538/boards/ezkit.c | |||
@@ -49,8 +49,13 @@ static struct resource bfin_uart0_resources[] = { | |||
49 | .flags = IORESOURCE_MEM, | 49 | .flags = IORESOURCE_MEM, |
50 | }, | 50 | }, |
51 | { | 51 | { |
52 | .start = IRQ_UART0_TX, | ||
53 | .end = IRQ_UART0_TX, | ||
54 | .flags = IORESOURCE_IRQ, | ||
55 | }, | ||
56 | { | ||
52 | .start = IRQ_UART0_RX, | 57 | .start = IRQ_UART0_RX, |
53 | .end = IRQ_UART0_RX+1, | 58 | .end = IRQ_UART0_RX, |
54 | .flags = IORESOURCE_IRQ, | 59 | .flags = IORESOURCE_IRQ, |
55 | }, | 60 | }, |
56 | { | 61 | { |
@@ -104,8 +109,13 @@ static struct resource bfin_uart1_resources[] = { | |||
104 | .flags = IORESOURCE_MEM, | 109 | .flags = IORESOURCE_MEM, |
105 | }, | 110 | }, |
106 | { | 111 | { |
112 | .start = IRQ_UART1_TX, | ||
113 | .end = IRQ_UART1_TX, | ||
114 | .flags = IORESOURCE_IRQ, | ||
115 | }, | ||
116 | { | ||
107 | .start = IRQ_UART1_RX, | 117 | .start = IRQ_UART1_RX, |
108 | .end = IRQ_UART1_RX+1, | 118 | .end = IRQ_UART1_RX, |
109 | .flags = IORESOURCE_IRQ, | 119 | .flags = IORESOURCE_IRQ, |
110 | }, | 120 | }, |
111 | { | 121 | { |
@@ -147,8 +157,13 @@ static struct resource bfin_uart2_resources[] = { | |||
147 | .flags = IORESOURCE_MEM, | 157 | .flags = IORESOURCE_MEM, |
148 | }, | 158 | }, |
149 | { | 159 | { |
160 | .start = IRQ_UART2_TX, | ||
161 | .end = IRQ_UART2_TX, | ||
162 | .flags = IORESOURCE_IRQ, | ||
163 | }, | ||
164 | { | ||
150 | .start = IRQ_UART2_RX, | 165 | .start = IRQ_UART2_RX, |
151 | .end = IRQ_UART2_RX+1, | 166 | .end = IRQ_UART2_RX, |
152 | .flags = IORESOURCE_IRQ, | 167 | .flags = IORESOURCE_IRQ, |
153 | }, | 168 | }, |
154 | { | 169 | { |