From owner-svn-src-projects@FreeBSD.ORG Fri May 24 03:59:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 960307AC; Fri, 24 May 2013 03:59:14 +0000 (UTC) (envelope-from jhibbits@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 880E7774; Fri, 24 May 2013 03:59:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4O3xEP2026346; Fri, 24 May 2013 03:59:14 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4O3xECM026345; Fri, 24 May 2013 03:59:14 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201305240359.r4O3xECM026345@svn.freebsd.org> From: Justin Hibbits Date: Fri, 24 May 2013 03:59:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r250957 - projects/pmac_pmu/sys/powerpc/powermac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 May 2013 03:59:14 -0000 Author: jhibbits Date: Fri May 24 03:59:14 2013 New Revision: 250957 URL: http://svnweb.freebsd.org/changeset/base/250957 Log: Fix the save/restore of GPIOs on macio. Modified: projects/pmac_pmu/sys/powerpc/powermac/macgpio.c Modified: projects/pmac_pmu/sys/powerpc/powermac/macgpio.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/macgpio.c Fri May 24 03:58:31 2013 (r250956) +++ projects/pmac_pmu/sys/powerpc/powermac/macgpio.c Fri May 24 03:59:14 2013 (r250957) @@ -338,9 +338,9 @@ macgpio_suspend(device_t dev) sc->sc_saved_gpio_levels[1] = bus_read_4(sc->sc_gpios, GPIO_LEVELS_1); for (i = 0; i < GPIO_COUNT; i++) - sc->sc_saved_gpios[i] = bus_read_1(sc->sc_gpios, GPIO_BASE); + sc->sc_saved_gpios[i] = bus_read_1(sc->sc_gpios, GPIO_BASE + i); for (i = 0; i < GPIO_EXTINT_COUNT; i++) - sc->sc_saved_extint_gpios[i] = bus_read_1(sc->sc_gpios, GPIO_EXTINT_BASE); + sc->sc_saved_extint_gpios[i] = bus_read_1(sc->sc_gpios, GPIO_EXTINT_BASE + i); return (0); } @@ -356,9 +356,9 @@ macgpio_resume(device_t dev) bus_write_4(sc->sc_gpios, GPIO_LEVELS_1, sc->sc_saved_gpio_levels[1]); for (i = 0; i < GPIO_COUNT; i++) - bus_write_1(sc->sc_gpios, GPIO_BASE, sc->sc_saved_gpios[i]); + bus_write_1(sc->sc_gpios, GPIO_BASE + i, sc->sc_saved_gpios[i]); for (i = 0; i < GPIO_EXTINT_COUNT; i++) - bus_write_1(sc->sc_gpios, GPIO_EXTINT_BASE, sc->sc_saved_extint_gpios[i]); + bus_write_1(sc->sc_gpios, GPIO_EXTINT_BASE + i, sc->sc_saved_extint_gpios[i]); return (0); }