From owner-svn-src-all@FreeBSD.ORG Wed Feb 27 08:32:35 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 69C312F3; Wed, 27 Feb 2013 08:32:35 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 44633117; Wed, 27 Feb 2013 08:32:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1R8WZoX074996; Wed, 27 Feb 2013 08:32:35 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1R8WZmP074995; Wed, 27 Feb 2013 08:32:35 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201302270832.r1R8WZmP074995@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 27 Feb 2013 08:32:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r247390 - head/sys/arm/ti X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 27 Feb 2013 08:32:35 -0000 Author: gonzo Date: Wed Feb 27 08:32:34 2013 New Revision: 247390 URL: http://svnweb.freebsd.org/changeset/base/247390 Log: - Initialize GPIO_OE register based on pinmux configuration Although AM335x TRM states that GPIO_OE register is not used and just reflects pads configuration in practice it does control pin behavior and shoiuld be set in addition to pinmux setup Modified: head/sys/arm/ti/ti_gpio.c Modified: head/sys/arm/ti/ti_gpio.c ============================================================================== --- head/sys/arm/ti/ti_gpio.c Wed Feb 27 07:34:09 2013 (r247389) +++ head/sys/arm/ti/ti_gpio.c Wed Feb 27 08:32:34 2013 (r247390) @@ -653,6 +653,9 @@ ti_gpio_attach(device_t dev) struct ti_gpio_softc *sc = device_get_softc(dev); unsigned int i; int err = 0; + int pin; + uint32_t flags; + uint32_t reg_oe; sc->sc_dev = dev; @@ -720,6 +723,17 @@ ti_gpio_attach(device_t dev) /* Disable interrupts for all pins */ ti_gpio_write_4(sc, i, TI_GPIO_CLEARIRQENABLE1, 0xffffffff); ti_gpio_write_4(sc, i, TI_GPIO_CLEARIRQENABLE2, 0xffffffff); + + /* Init OE registger based on pads configuration */ + reg_oe = 0xffffffff; + for (pin = 0; pin < 32; pin++) { + ti_scm_padconf_get_gpioflags( + PINS_PER_BANK*i + pin, &flags); + if (flags & GPIO_PIN_OUTPUT) + reg_oe &= ~(1U << pin); + } + + ti_gpio_write_4(sc, i, TI_GPIO_OE, reg_oe); } }