diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-19 01:30:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-19 01:30:00 -0400 |
commit | 664322a4475236bd9900f2853a9b981a4377493f (patch) | |
tree | 50581bba5accbc6ba8b0304a622e97e1b7167512 /arch/blackfin/mach-bf548/Kconfig | |
parent | 99759619b27662d1290901228d77a293e6e83200 (diff) | |
parent | 0c082bd15828135d609a2f593b583de9eacece0f (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (32 commits)
Blackfin: ip0x: fix unused variable warning
Blackfin: punt unused HDMA masks
Blackfin: wire up new syscalls
Blackfin/ipipe: restore pipeline bits in irqflags
Blackfin/ipipe: fix deferred pipeline sync for the root stage
Blackfin/ipipe: upgrade to I-pipe mainline
Blackfin: cpufreq: fix typos
Blackfin: enable GENERIC_HARDIRQS_NO_DEPRECATED
Blackfin: SMP: convert to irq chip functions
Blackfin: use accessor functions in show_interrupts()
Blackfin: use proper wrapper functions for modifying irq status
Blackfin: convert gpio irq_chip to new functions
Blackfin: convert mac irq_chip to new functions
Blackfin: convert error irq_chip to new functions
Blackfin: convert internal irq_chip to new functions
Blackfin: convert core irq_chip to new functions
Blackfin: use proper wrappers for irq_desc
Blackfin: optimize startup code
Blackfin: SMP: work around anomaly 05000491
Blackfin: SMP: implement cpu_freq support
...
Diffstat (limited to 'arch/blackfin/mach-bf548/Kconfig')
-rw-r--r-- | arch/blackfin/mach-bf548/Kconfig | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf548/Kconfig b/arch/blackfin/mach-bf548/Kconfig index 70189a0d1a19..94acb586832e 100644 --- a/arch/blackfin/mach-bf548/Kconfig +++ b/arch/blackfin/mach-bf548/Kconfig | |||
@@ -42,6 +42,65 @@ config BF548_ATAPI_ALTERNATIVE_PORT | |||
42 | async address or GPIO port F and G. Select y to route it | 42 | async address or GPIO port F and G. Select y to route it |
43 | to GPIO. | 43 | to GPIO. |
44 | 44 | ||
45 | choice | ||
46 | prompt "UART2 DMA channel selection" | ||
47 | depends on SERIAL_BFIN_UART2 | ||
48 | default UART2_DMA_RX_ON_DMA18 | ||
49 | help | ||
50 | UART2 DMA channel selection | ||
51 | RX -> DMA18 | ||
52 | TX -> DMA19 | ||
53 | or | ||
54 | RX -> DMA13 | ||
55 | TX -> DMA14 | ||
56 | |||
57 | config UART2_DMA_RX_ON_DMA18 | ||
58 | bool "UART2 DMA RX -> DMA18 TX -> DMA19" | ||
59 | help | ||
60 | UART2 DMA channel assignment | ||
61 | RX -> DMA18 | ||
62 | TX -> DMA19 | ||
63 | use SPORT2 default DMA channel | ||
64 | |||
65 | config UART2_DMA_RX_ON_DMA13 | ||
66 | bool "UART2 DMA RX -> DMA13 TX -> DMA14" | ||
67 | help | ||
68 | UART2 DMA channel assignment | ||
69 | RX -> DMA13 | ||
70 | TX -> DMA14 | ||
71 | use EPPI1 EPPI2 default DMA channel | ||
72 | endchoice | ||
73 | |||
74 | choice | ||
75 | prompt "UART3 DMA channel selection" | ||
76 | depends on SERIAL_BFIN_UART3 | ||
77 | default UART3_DMA_RX_ON_DMA20 | ||
78 | help | ||
79 | UART3 DMA channel selection | ||
80 | RX -> DMA20 | ||
81 | TX -> DMA21 | ||
82 | or | ||
83 | RX -> DMA15 | ||
84 | TX -> DMA16 | ||
85 | |||
86 | config UART3_DMA_RX_ON_DMA20 | ||
87 | bool "UART3 DMA RX -> DMA20 TX -> DMA21" | ||
88 | help | ||
89 | UART3 DMA channel assignment | ||
90 | RX -> DMA20 | ||
91 | TX -> DMA21 | ||
92 | use SPORT3 default DMA channel | ||
93 | |||
94 | config UART3_DMA_RX_ON_DMA15 | ||
95 | bool "UART3 DMA RX -> DMA15 TX -> DMA16" | ||
96 | help | ||
97 | UART3 DMA channel assignment | ||
98 | RX -> DMA15 | ||
99 | TX -> DMA16 | ||
100 | use PIXC default DMA channel | ||
101 | |||
102 | endchoice | ||
103 | |||
45 | comment "Interrupt Priority Assignment" | 104 | comment "Interrupt Priority Assignment" |
46 | menu "Priority" | 105 | menu "Priority" |
47 | 106 | ||