From owner-svn-src-all@FreeBSD.ORG Mon Feb 7 05:36:32 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3697106566B; Mon, 7 Feb 2011 05:36:32 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 781538FC17; Mon, 7 Feb 2011 05:36:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p175aWSb098277; Mon, 7 Feb 2011 05:36:32 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p175aW2R098275; Mon, 7 Feb 2011 05:36:32 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201102070536.p175aW2R098275@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 7 Feb 2011 05:36:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218388 - head/sys/arm/mv X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2011 05:36:32 -0000 Author: marcel Date: Mon Feb 7 05:36:32 2011 New Revision: 218388 URL: http://svn.freebsd.org/changeset/base/218388 Log: Remove use_high from the softc and simply check the number of GPIO pins to determine whether there's a high register set or not. This allows platform_gpio_init() to work without duplicating the work done in the attach method. Modified: head/sys/arm/mv/gpio.c Modified: head/sys/arm/mv/gpio.c ============================================================================== --- head/sys/arm/mv/gpio.c Mon Feb 7 01:13:57 2011 (r218387) +++ head/sys/arm/mv/gpio.c Mon Feb 7 05:36:32 2011 (r218388) @@ -64,7 +64,6 @@ struct mv_gpio_softc { bus_space_handle_t bsh; uint8_t pin_num; /* number of GPIO pins */ uint8_t irq_num; /* number of real IRQs occupied by GPIO controller */ - uint8_t use_high; }; extern struct resource_spec mv_gpio_res[]; @@ -141,7 +140,6 @@ mv_gpio_attach(device_t dev) uint32_t dev_id, rev_id; sc = (struct mv_gpio_softc *)device_get_softc(dev); - if (sc == NULL) return (ENXIO); @@ -156,12 +154,10 @@ mv_gpio_attach(device_t dev) dev_id == MV_DEV_MV78100_Z0 ) { sc->pin_num = 32; sc->irq_num = 4; - sc->use_high = 0; } else if (dev_id == MV_DEV_88F6281) { sc->pin_num = 50; sc->irq_num = 7; - sc->use_high = 1; } else { device_printf(dev, "unknown chip id=0x%x\n", dev_id); @@ -182,7 +178,7 @@ mv_gpio_attach(device_t dev) bus_space_write_4(sc->bst, sc->bsh, GPIO_INT_LEV_MASK, 0); bus_space_write_4(sc->bst, sc->bsh, GPIO_INT_CAUSE, 0); - if (sc->use_high) { + if (sc->pin_num > GPIO_PINS_PER_REG) { bus_space_write_4(sc->bst, sc->bsh, GPIO_HI_INT_EDGE_MASK, 0); bus_space_write_4(sc->bst, sc->bsh, @@ -217,7 +213,7 @@ mv_gpio_intr(void *arg) int_cause = mv_gpio_reg_read(GPIO_INT_CAUSE); gpio_val = mv_gpio_reg_read(GPIO_DATA_IN); gpio_val &= int_cause; - if (mv_gpio_softc->use_high) { + if (mv_gpio_softc->pin_num > GPIO_PINS_PER_REG) { int_cause_hi = mv_gpio_reg_read(GPIO_HI_INT_CAUSE); gpio_val_hi = mv_gpio_reg_read(GPIO_HI_DATA_IN); gpio_val_hi &= int_cause_hi; @@ -231,7 +227,7 @@ mv_gpio_intr(void *arg) i++; } - if (mv_gpio_softc->use_high) { + if (mv_gpio_softc->pin_num > GPIO_PINS_PER_REG) { i = 0; while (gpio_val_hi != 0) { if (gpio_val_hi & 1)