From owner-p4-projects@FreeBSD.ORG Fri Aug 4 14:19:03 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 8A52D16A4E0; Fri, 4 Aug 2006 14:19:03 +0000 (UTC) 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 373CC16A4DF for ; Fri, 4 Aug 2006 14:19:03 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D776943D5C for ; Fri, 4 Aug 2006 14:19:02 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74EJ21d095332 for ; Fri, 4 Aug 2006 14:19:02 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74EJ2di095329 for perforce@freebsd.org; Fri, 4 Aug 2006 14:19:02 GMT (envelope-from kevlo@freebsd.org) Date: Fri, 4 Aug 2006 14:19:02 GMT Message-Id: <200608041419.k74EJ2di095329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 103170 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: Fri, 04 Aug 2006 14:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=103170 Change 103170 by kevlo@kevlo_monet on 2006/08/04 14:18:56 Bring in gpio-based i2c interface support. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/AVILA#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#4 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#2 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#9 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 add .. //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/AVILA#2 (text+ko) ==== @@ -89,6 +89,13 @@ #options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. +# I2C Bus +device iicbus +device iicbb +device iic + +device ixpiic + # Debugging for use in -current options KDB options DDB #Enable the kernel debugger ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#4 (text+ko) ==== @@ -5,6 +5,7 @@ arm/xscale/ixp425/ixp425_mem.c standard arm/xscale/ixp425/ixp425_space.c standard arm/xscale/ixp425/ixp425_timer.c standard +arm/xscale/ixp425/ixp425_iic.c optional ixpiic arm/xscale/ixp425/ixp425_pci.c optional pci arm/xscale/ixp425/ixp425_pci_asm.S optional pci arm/xscale/ixp425/ixp425_pci_space.c optional pci ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#2 (text+ko) ==== @@ -43,7 +43,9 @@ #define GPIO_PCI_INTC 9 #define GPIO_PCI_INTD 8 #define GPIO_I2C_SDA 7 +#define GPIO_I2C_SDA_BIT (1U << 7) #define GPIO_I2C_SCL 6 +#define GPIO_I2C_SCL_BIT (1U << 6) /* Interrupt */ #define PCI_INT_A IXP425_INT_GPIO_11 #define PCI_INT_B IXP425_INT_GPIO_10 ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#9 (text+ko) ==== @@ -228,6 +228,7 @@ device_add_child(dev, "pcib", 0); device_add_child(dev, "ixpclk", 0); + device_add_child(dev, "ixpiic", 0); if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, 0, &sc->sc_gpio_ioh)) ==== //depot/projects/arm/src/sys/dev/iicbus/iicbb.c#3 (text+ko) ==== @@ -379,6 +379,7 @@ } DRIVER_MODULE(iicbb, bktr, iicbb_driver, iicbb_devclass, 0, 0); +DRIVER_MODULE(iicbb, ixpiic, iicbb_driver, iicbb_devclass, 0, 0); DRIVER_MODULE(iicbb, lpbb, iicbb_driver, iicbb_devclass, 0, 0); DRIVER_MODULE(iicbb, viapm, iicbb_driver, iicbb_devclass, 0, 0);