PERFORCE change 181252 for review

[Jakub Wojciech Klama]

http://p4web.freebsd.org/@@181252?ac=10

Change 181252 by jceel at jceel on 2010/07/21 10:39:00

	Update davinci_devices.c to assign DMA channels to on-board devices.

Affected files ...

.. //depot/projects/soc2010/jceel_dma/sys/arm/conf/DAVINCI#5 edit
.. //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_devices.c#3 edit

Differences ...

==== //depot/projects/soc2010/jceel_dma/sys/arm/conf/DAVINCI#5 (text+ko) ====

@@ -48,8 +48,8 @@
 options 	ALT_BREAK_TO_DEBUGGER
 options 	DDB
 options 	DIAGNOSTIC
-options 	INVARIANTS		#Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+#options 	INVARIANTS		#Enable calls of extra sanity checking
+#options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 options 	KDB
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed

==== //depot/projects/soc2010/jceel_dma/sys/arm/davinci/davinci_devices.c#3 (text+ko) ====

@@ -37,37 +37,45 @@
 	{ "aintc", DAVINCI_AINTC_BASE, DAVINCI_AINTC_SIZE,
 	    { -1 },
 	    { -1 },
+	    { -1 },
 	},
 	{ "psc", DAVINCI_PSC_BASE, DAVINCI_PSC_SIZE,
 	    { DAVINCI_PSCINT, -1 },
 	    { -1 },
+	    { -1 },
 	},
 	{ "timer", DAVINCI_TIMERS_BASE, DAVINCI_TIMERS_SIZE,
 	    { DAVINCI_TINT0, DAVINCI_TINT1, -1 },
 	    { DAVINCI_PSC_TIMER0_IDX, -1 },
+	    { -1 },
+	},
+	{ "edma", DAVINCI_EDMA_BASE, DAVINCI_EDMA_SIZE,
+	    { DAVINCI_EDMA3CC_INT0, DAVINCI_EDMA3CC_ERRINT,
+	      DAVINCI_EDMA3TC_ERRINT0, DAVINCI_EDMA3TC_ERRINT1, -1 },
+	    { DAVINCI_PSC_EDMACC_IDX, DAVINCI_PSC_EDMATC0_IDX,
+	      DAVINCI_PSC_EDMATC1_IDX, -1 },
+	    { -1 },
 	},
 	{ "uart", DAVINCI_UART0_BASE, DAVINCI_UART_SIZE,
 	    { DAVINCI_UART0INT, -1 },
 	    { DAVINCI_PSC_UART0_IDX, -1 },
+	    { DAVINCI_URXEVT0, DAVINCI_UTXEVT0 },
 	},
 	{ "dve", DAVINCI_EMAC_BASE, DAVINCI_EMAC_SIZE,
 	    { DAVINCI_EMACINT, -1 },
 	    { DAVINCI_PSC_EMAC_IDX, DAVINCI_PSC_EMACMC_IDX, 
 	      DAVINCI_PSC_MDIO_IDX, -1 },
+	    { -1 },
 	},
 	{ "dvata", DAVINCI_ATA_BASE, DAVINCI_ATA_SIZE,
 	    { DAVINCI_ATAINT, -1 },
 	    { DAVINCI_PSC_ATA_IDX, -1 },
+	    { -1 },
 	},
 	{ "dvmmc", DAVINCI_MMC_BASE, DAVINCI_MMC_SIZE,
 	    { DAVINCI_MMCINT, -1 },
 	    { DAVINCI_PSC_MMC_IDX, -1 },
-	},
-	{ "edma", DAVINCI_EDMA_BASE, DAVINCI_EDMA_SIZE,
-	    { DAVINCI_EDMA3CC_INT0, DAVINCI_EDMA3CC_ERRINT,
-	      DAVINCI_EDMA3TC_ERRINT0, DAVINCI_EDMA3TC_ERRINT1, -1 },
-	    { DAVINCI_PSC_EDMACC_IDX, DAVINCI_PSC_EDMATC0_IDX,
-	      DAVINCI_PSC_EDMATC1_IDX, -1 },
+	    { DAVINCI_MMCRXEVT, DAVINCI_MMCTXEVT },
 	},
 	{ .od_name = NULL, }
 };