diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-24 03:34:03 -0500 |
commit | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (patch) | |
tree | fe6fa1c0b92c43804a31b443ce4b5159d4d0ce13 /arch/blackfin/mach-bf548/boards/cm_bf548.c | |
parent | f87114e982cf3b657411e2df50e4e42ec1f162dd (diff) | |
parent | be09d1dcf21eb3121bed3ee4dadacdea1805d7f8 (diff) |
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
Diffstat (limited to 'arch/blackfin/mach-bf548/boards/cm_bf548.c')
-rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 212b9e0a08c8..0350eacec21b 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
@@ -135,8 +135,13 @@ static struct resource bfin_uart0_resources[] = { | |||
135 | .flags = IORESOURCE_MEM, | 135 | .flags = IORESOURCE_MEM, |
136 | }, | 136 | }, |
137 | { | 137 | { |
138 | .start = IRQ_UART0_TX, | ||
139 | .end = IRQ_UART0_TX, | ||
140 | .flags = IORESOURCE_IRQ, | ||
141 | }, | ||
142 | { | ||
138 | .start = IRQ_UART0_RX, | 143 | .start = IRQ_UART0_RX, |
139 | .end = IRQ_UART0_RX+1, | 144 | .end = IRQ_UART0_RX, |
140 | .flags = IORESOURCE_IRQ, | 145 | .flags = IORESOURCE_IRQ, |
141 | }, | 146 | }, |
142 | { | 147 | { |
@@ -178,8 +183,13 @@ static struct resource bfin_uart1_resources[] = { | |||
178 | .flags = IORESOURCE_MEM, | 183 | .flags = IORESOURCE_MEM, |
179 | }, | 184 | }, |
180 | { | 185 | { |
186 | .start = IRQ_UART1_TX, | ||
187 | .end = IRQ_UART1_TX, | ||
188 | .flags = IORESOURCE_IRQ, | ||
189 | }, | ||
190 | { | ||
181 | .start = IRQ_UART1_RX, | 191 | .start = IRQ_UART1_RX, |
182 | .end = IRQ_UART1_RX+1, | 192 | .end = IRQ_UART1_RX, |
183 | .flags = IORESOURCE_IRQ, | 193 | .flags = IORESOURCE_IRQ, |
184 | }, | 194 | }, |
185 | { | 195 | { |
@@ -237,8 +247,13 @@ static struct resource bfin_uart2_resources[] = { | |||
237 | .flags = IORESOURCE_MEM, | 247 | .flags = IORESOURCE_MEM, |
238 | }, | 248 | }, |
239 | { | 249 | { |
250 | .start = IRQ_UART2_TX, | ||
251 | .end = IRQ_UART2_TX, | ||
252 | .flags = IORESOURCE_IRQ, | ||
253 | }, | ||
254 | { | ||
240 | .start = IRQ_UART2_RX, | 255 | .start = IRQ_UART2_RX, |
241 | .end = IRQ_UART2_RX+1, | 256 | .end = IRQ_UART2_RX, |
242 | .flags = IORESOURCE_IRQ, | 257 | .flags = IORESOURCE_IRQ, |
243 | }, | 258 | }, |
244 | { | 259 | { |
@@ -280,8 +295,13 @@ static struct resource bfin_uart3_resources[] = { | |||
280 | .flags = IORESOURCE_MEM, | 295 | .flags = IORESOURCE_MEM, |
281 | }, | 296 | }, |
282 | { | 297 | { |
298 | .start = IRQ_UART3_TX, | ||
299 | .end = IRQ_UART3_TX, | ||
300 | .flags = IORESOURCE_IRQ, | ||
301 | }, | ||
302 | { | ||
283 | .start = IRQ_UART3_RX, | 303 | .start = IRQ_UART3_RX, |
284 | .end = IRQ_UART3_RX+1, | 304 | .end = IRQ_UART3_RX, |
285 | .flags = IORESOURCE_IRQ, | 305 | .flags = IORESOURCE_IRQ, |
286 | }, | 306 | }, |
287 | { | 307 | { |