Title: [4214] branches/2008R1: Fix bug[#3875] Enable UART2 and UART3 on bf548.
- Revision
- 4214
- Author
- sonicz
- Date
- 2008-02-01 23:56:08 -0600 (Fri, 01 Feb 2008)
Log Message
Fix bug[#3875] Enable UART2 and UART3 on bf548.
Add UART2 DMA channel numbers and IRQ numbers. Set proper DMA PMAP in
request_dma().
Diffstat
arch/blackfin/kernel/bfin_dma_5xx.c | 10 ++++++++++
include/asm-blackfin/mach-bf548/dma.h | 4 ++++
include/asm-blackfin/mach-bf548/irq.h | 8 ++++++++
3 files changed, 22 insertions(+)
Modified Paths
Diff
Modified: branches/2008R1/arch/blackfin/kernel/bfin_dma_5xx.c (4213 => 4214)
--- branches/2008R1/arch/blackfin/kernel/bfin_dma_5xx.c 2008-02-01 19:57:39 UTC (rev 4213)
+++ branches/2008R1/arch/blackfin/kernel/bfin_dma_5xx.c 2008-02-02 05:56:08 UTC (rev 4214)
@@ -104,6 +104,16 @@
mutex_unlock(&(dma_ch[channel].dmalock));
+#ifdef CONFIG_BF54x
+ if (channel >= CH_UART2_RX && channel <= CH_UART3_TX &&
+ strncmp(device_id, "BFIN_UART", 9) == 0)
+ dma_ch[channel].regs->peripheral_map |=
+ (channel - CH_UART2_RX + 0xC);
+ else
+ dma_ch[channel].regs->peripheral_map |=
+ (channel - CH_UART2_RX + 0x6);
+#endif
+
dma_ch[channel].device_id = device_id;
dma_ch[channel].irq_callback = NULL;
Modified: branches/2008R1/include/asm-blackfin/mach-bf548/dma.h (4213 => 4214)
--- branches/2008R1/include/asm-blackfin/mach-bf548/dma.h 2008-02-01 19:57:39 UTC (rev 4213)
+++ branches/2008R1/include/asm-blackfin/mach-bf548/dma.h 2008-02-02 05:56:08 UTC (rev 4214)
@@ -51,9 +51,13 @@
#define CH_PIXC_OVERLAY 16
#define CH_PIXC_OUTPUT 17
#define CH_SPORT2_RX 18
+#define CH_UART2_RX 18
#define CH_SPORT2_TX 19
+#define CH_UART2_TX 19
#define CH_SPORT3_RX 20
+#define CH_UART3_RX 20
#define CH_SPORT3_TX 21
+#define CH_UART3_TX 21
#define CH_SDH 22
#define CH_NFC 22
#define CH_SPI2 23
Modified: branches/2008R1/include/asm-blackfin/mach-bf548/irq.h (4213 => 4214)
--- branches/2008R1/include/asm-blackfin/mach-bf548/irq.h 2008-02-01 19:57:39 UTC (rev 4213)
+++ branches/2008R1/include/asm-blackfin/mach-bf548/irq.h 2008-02-02 05:56:08 UTC (rev 4214)
@@ -99,9 +99,13 @@
#define IRQ_UART2_ERROR BFIN_IRQ(31) /* UART2 Status (Error) Interrupt */
#define IRQ_CAN0_ERROR BFIN_IRQ(32) /* CAN0 Status (Error) Interrupt */
#define IRQ_SPORT2_RX BFIN_IRQ(33) /* SPORT2 RX (DMA18) Interrupt */
+#define IRQ_UART2_RX BFIN_IRQ(33) /* UART2 RX (DMA18) Interrupt */
#define IRQ_SPORT2_TX BFIN_IRQ(34) /* SPORT2 TX (DMA19) Interrupt */
+#define IRQ_UART2_TX BFIN_IRQ(34) /* UART2 TX (DMA19) Interrupt */
#define IRQ_SPORT3_RX BFIN_IRQ(35) /* SPORT3 RX (DMA20) Interrupt */
+#define IRQ_UART3_RX BFIN_IRQ(35) /* UART3 RX (DMA20) Interrupt */
#define IRQ_SPORT3_TX BFIN_IRQ(36) /* SPORT3 TX (DMA21) Interrupt */
+#define IRQ_UART3_TX BFIN_IRQ(36) /* UART3 TX (DMA21) Interrupt */
#define IRQ_EPPI1 BFIN_IRQ(37) /* EPP1 (DMA13) Interrupt */
#define IRQ_EPPI2 BFIN_IRQ(38) /* EPP2 (DMA14) Interrupt */
#define IRQ_SPI1 BFIN_IRQ(39) /* SPI1 (DMA5) Interrupt */
@@ -421,9 +425,13 @@
/* IAR4 BIT FILEDS */
#define IRQ_CAN0_ERR_POS 0
#define IRQ_SPORT2_RX_POS 4
+#define IRQ_UART2_RX_POS 4
#define IRQ_SPORT2_TX_POS 8
+#define IRQ_UART2_TX_POS 8
#define IRQ_SPORT3_RX_POS 12
+#define IRQ_UART3_RX_POS 12
#define IRQ_SPORT3_TX_POS 16
+#define IRQ_UART3_TX_POS 16
#define IRQ_EPPI1_POS 20
#define IRQ_EPPI2_POS 24
#define IRQ_SPI1_POS 28
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
