diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2013-06-17 04:29:59 -0400 |
---|---|---|
committer | Steven Miao <realmz6@gmail.com> | 2013-11-15 05:14:33 -0500 |
commit | eb06c06494c4fc5f493074cb082081a17a2d7a45 (patch) | |
tree | 00d8664ec009acb1927a51a8c1a0f90ed7ca20a9 /arch/blackfin/mach-bf609 | |
parent | 37035d62a4dfa7b8cba9b0c8ff6317dba56dd62d (diff) |
blackfin: serial: Add serial port_fer and port_mux early platform resources.
The serial driver sets up port function manually in early platform probe stage
if the ADI GPIO2 driver is used. Remove the bfin_sport_uart early platform
devices.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Diffstat (limited to 'arch/blackfin/mach-bf609')
-rw-r--r-- | arch/blackfin/mach-bf609/boards/ezkit.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c index aba6b54489ff..82beedd953f6 100644 --- a/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/arch/blackfin/mach-bf609/boards/ezkit.c | |||
@@ -213,6 +213,18 @@ static struct resource bfin_uart0_resources[] = { | |||
213 | .end = UART0_RXDIV+4, | 213 | .end = UART0_RXDIV+4, |
214 | .flags = IORESOURCE_MEM, | 214 | .flags = IORESOURCE_MEM, |
215 | }, | 215 | }, |
216 | #ifdef CONFIG_EARLY_PRINTK | ||
217 | { | ||
218 | .start = PORTD_FER, | ||
219 | .end = PORTD_FER+2, | ||
220 | .flags = IORESOURCE_REG, | ||
221 | }, | ||
222 | { | ||
223 | .start = PORTD_MUX, | ||
224 | .end = PORTD_MUX+3, | ||
225 | .flags = IORESOURCE_REG, | ||
226 | }, | ||
227 | #endif | ||
216 | { | 228 | { |
217 | .start = IRQ_UART0_TX, | 229 | .start = IRQ_UART0_TX, |
218 | .end = IRQ_UART0_TX, | 230 | .end = IRQ_UART0_TX, |
@@ -277,6 +289,13 @@ static struct resource bfin_uart1_resources[] = { | |||
277 | .end = UART1_RXDIV+4, | 289 | .end = UART1_RXDIV+4, |
278 | .flags = IORESOURCE_MEM, | 290 | .flags = IORESOURCE_MEM, |
279 | }, | 291 | }, |
292 | #ifdef CONFIG_EARLY_PRINTK | ||
293 | { | ||
294 | .start = PORTG_FER_SET, | ||
295 | .end = PORTG_FER_SET+2, | ||
296 | .flags = IORESOURCE_REG, | ||
297 | }, | ||
298 | #endif | ||
280 | { | 299 | { |
281 | .start = IRQ_UART1_TX, | 300 | .start = IRQ_UART1_TX, |
282 | .end = IRQ_UART1_TX, | 301 | .end = IRQ_UART1_TX, |
@@ -2100,18 +2119,6 @@ static struct platform_device *ezkit_early_devices[] __initdata = { | |||
2100 | &bfin_uart1_device, | 2119 | &bfin_uart1_device, |
2101 | #endif | 2120 | #endif |
2102 | #endif | 2121 | #endif |
2103 | |||
2104 | #if defined(CONFIG_SERIAL_BFIN_SPORT_CONSOLE) | ||
2105 | #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART | ||
2106 | &bfin_sport0_uart_device, | ||
2107 | #endif | ||
2108 | #ifdef CONFIG_SERIAL_BFIN_SPORT1_UART | ||
2109 | &bfin_sport1_uart_device, | ||
2110 | #endif | ||
2111 | #ifdef CONFIG_SERIAL_BFIN_SPORT2_UART | ||
2112 | &bfin_sport2_uart_device, | ||
2113 | #endif | ||
2114 | #endif | ||
2115 | }; | 2122 | }; |
2116 | 2123 | ||
2117 | void __init native_machine_early_platform_add_devices(void) | 2124 | void __init native_machine_early_platform_add_devices(void) |