From owner-p4-projects@FreeBSD.ORG Wed Jul 21 10:39:02 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3B211065675; Wed, 21 Jul 2010 10:39:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A837A1065674 for ; Wed, 21 Jul 2010 10:39:01 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 956A18FC0A for ; Wed, 21 Jul 2010 10:39:01 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6LAd1s4023126 for ; Wed, 21 Jul 2010 10:39:01 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6LAd11N023124 for perforce@freebsd.org; Wed, 21 Jul 2010 10:39:01 GMT (envelope-from jceel@freebsd.org) Date: Wed, 21 Jul 2010 10:39:01 GMT Message-Id: <201007211039.o6LAd11N023124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2010 10:39:02 -0000 http://p4web.freebsd.org/@@181252?ac=10 Change 181252 by jceel@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, } };