From owner-p4-projects@FreeBSD.ORG Wed Jan 4 00:35:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2C4916A422; Wed, 4 Jan 2006 00:35:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8019E16A41F for ; Wed, 4 Jan 2006 00:35:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C9A343D49 for ; Wed, 4 Jan 2006 00:35:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k040Z1wA038104 for ; Wed, 4 Jan 2006 00:35:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k040Z00n038101 for perforce@freebsd.org; Wed, 4 Jan 2006 00:35:00 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Jan 2006 00:35:00 GMT Message-Id: <200601040035.k040Z00n038101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 00:35:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=89116 Change 89116 by imp@imp_Speedy on 2006/01/04 00:34:44 Add the built-in devices to the devices that are probed. Most of these do not yet have drivers, but adding them shouldn't hurt anything. This likely should be handled by hints, but I'm too lazy right now to make hints work. Also, use #defines for IRQ numbers rather than hard coding them. This add drivers for everything but the PIOs, PMC, ST, RTC, TC and MC devices since I'm not yet sure the best way to export those devices yet. It does add UDP (usb device port), MCI (MMC reader), TWI (two wire interface), SSCn (Serial Synchronous Controller) and the SPI (Serial Peripheral Interface). Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#8 (text+ko) ==== @@ -256,16 +256,32 @@ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_ICCR, 0xffffffff); at91rm92_add_child(dev, 0, "at91rm92_timer", 0, 0, 0, 1); - at91rm92_add_child(dev, 10, "uart", 0, AT91RM92_BASE + - AT91RM92_SYS_BASE + DBGU, DBGU_SIZE, 1); // DBGU - at91rm92_add_child(dev, 10, "uart", 1, AT91RM92_BASE + - AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, 6); // USART0 - at91rm92_add_child(dev, 10, "uart", 2, AT91RM92_BASE + - AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, 7); // USART1 - at91rm92_add_child(dev, 10, "uart", 3, AT91RM92_BASE + - AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, 8); // USART2 - at91rm92_add_child(dev, 10, "uart", 4, AT91RM92_BASE + - AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, 9); // USART3 + at91rm92_add_child(dev, 10, "atudp", 0, AT91RM92_BASE + // UDP + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, AT91RM92_IRQ_UDP); + at91rm92_add_child(dev, 10, "mci", 0, AT91RM92_BASE + // MCI + AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, AT91RM92_IRQ_MCI); + at91rm92_add_child(dev, 10, "twi", 0, AT91RM92_BASE + // TWI + AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, AT91RM92_IRQ_TWI); + at91rm92_add_child(dev, 10, "ate", 0, AT91RM92_BASE + // EMAC + AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, AT91RM92_IRQ_EMAC); + at91rm92_add_child(dev, 10, "uart", 0, AT91RM92_BASE + // DBGU + AT91RM92_SYS_BASE + DBGU, DBGU_SIZE, AT91RM92_IRQ_SYSTEM); + at91rm92_add_child(dev, 10, "uart", 1, AT91RM92_BASE + // USART0 + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART0); + at91rm92_add_child(dev, 10, "uart", 2, AT91RM92_BASE + // USART1 + AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART1); + at91rm92_add_child(dev, 10, "uart", 3, AT91RM92_BASE + // USART2 + AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART2); + at91rm92_add_child(dev, 10, "uart", 4, AT91RM92_BASE + // USART3 + AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART3); + at91rm92_add_child(dev, 10, "ssc", 0, AT91RM92_BASE + // SSC0 + AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC0); + at91rm92_add_child(dev, 10, "ssc", 1, AT91RM92_BASE + // SSC1 + AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC1); + at91rm92_add_child(dev, 10, "ssc", 2, AT91RM92_BASE + // SSC2 + AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC2); + at91rm92_add_child(dev, 10, "spi", 0, AT91RM92_BASE + // SPI + AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI); bus_generic_probe(dev); bus_generic_attach(dev); enable_interrupts(I32_bit | F32_bit);