---

yaml --- r: 58847 b: refs/heads/master c: 9be343c h: refs/heads/master i: 58845: 0265d1c 58843: 7468d7b 58839: bab2b9f 58831: 0c0854b 58815: 9db888c v: v3
git-mirror · Jul 12, 2007 · 8d89f03 · 8d89f03
1 parent f80e02f
commit 8d89f03
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9401e618c8f70920f34893946239e24d40a3519a
+refs/heads/master: 9be343c5bcd1cf285c2150f363bc9dd7aab8b7fb
diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig
@@ -729,6 +729,7 @@ config C_AMCKEN
 
 config C_CDPRIO
 	bool "DMA has priority over core for ext. accesses"
+	depends on !BF54x
 	default n
 
 config C_B0PEN

diff --git a/trunk/include/asm-blackfin/mach-bf548/bf548.h b/trunk/include/asm-blackfin/mach-bf548/bf548.h
@@ -32,16 +32,6 @@
 
 #define SUPPORTED_REVID 0
 
-/* Masks for generic ERROR IRQ demultiplexing used in int-priority-sc.c */
-
-#define SPI_ERR_MASK (TXCOL | RBSY | MODF | TXE)	/* SPI_STAT */
-#define SPORT_ERR_MASK (ROVF | RUVF | TOVF | TUVF)	/* SPORTx_STAT */
-#define PPI_ERR_MASK (0xFFFF & ~FLD)	/* PPI_STATUS */
-#define UART_ERR_MASK_STAT1 (0x4)	/* UARTx_IIR */
-#define UART_ERR_MASK_STAT0 (0x2)	/* UARTx_IIR */
-#define CAN_ERR_MASK  (EWTIF | EWRIF | EPIF | BOIF | WUIF | UIAIF | AAIF | \
-		RMLIF | UCEIF | EXTIF | ADIF)	/* CAN_GIF */
-
 #define OFFSET_(x) ((x) & 0x0000FFFF)
 
 /*some misc defines*/
@@ -113,13 +103,8 @@
 #else
 #define V_AMCKEN 0x0
 #endif
-#ifdef CONFIG_C_CDPRIO
-#define V_CDPRIO 0x100
-#else
-#define V_CDPRIO 0x0
-#endif
 
-#define AMGCTLVAL	(V_AMBEN | V_AMCKEN | V_CDPRIO)
+#define AMGCTLVAL	(V_AMBEN | V_AMCKEN)
 
 #define MAX_VC	650000000
 #define MIN_VC	50000000