From owner-svn-src-all@FreeBSD.ORG Sun Jan 4 23:14:05 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABC33FF1; Sun, 4 Jan 2015 23:14:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97DD71354; Sun, 4 Jan 2015 23:14:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t04NE5qm016431; Sun, 4 Jan 2015 23:14:05 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t04NE5CD016429; Sun, 4 Jan 2015 23:14:05 GMT (envelope-from br@FreeBSD.org) Message-Id: <201501042314.t04NE5CD016429@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Sun, 4 Jan 2015 23:14:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276670 - in head/sys/dev: altera/pio beri/virtio 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.18-1 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: Sun, 04 Jan 2015 23:14:05 -0000 Author: br Date: Sun Jan 4 23:14:04 2015 New Revision: 276670 URL: https://svnweb.freebsd.org/changeset/base/276670 Log: Do not configure Altera PIO device on ARM startup. PIO is a device implemented in soft-core and becomes available after flashing FPGA only. Modified: head/sys/dev/altera/pio/pio.c head/sys/dev/beri/virtio/virtio.c Modified: head/sys/dev/altera/pio/pio.c ============================================================================== --- head/sys/dev/altera/pio/pio.c Sun Jan 4 22:37:44 2015 (r276669) +++ head/sys/dev/altera/pio/pio.c Sun Jan 4 23:14:04 2015 (r276670) @@ -178,8 +178,6 @@ pio_attach(device_t dev) sc->bst = rman_get_bustag(sc->res[0]); sc->bsh = rman_get_bushandle(sc->res[0]); - WRITE4(sc, PIO_DATA, 0); - if ((node = ofw_bus_get_node(sc->dev)) == -1) return (ENXIO); Modified: head/sys/dev/beri/virtio/virtio.c ============================================================================== --- head/sys/dev/beri/virtio/virtio.c Sun Jan 4 22:37:44 2015 (r276669) +++ head/sys/dev/beri/virtio/virtio.c Sun Jan 4 23:14:04 2015 (r276670) @@ -211,8 +211,6 @@ setup_pio(device_t dev, char *name, devi SLIST_FOREACH(ic, &fdt_ic_list_head, fdt_ics) { if (ic->iph == pio_node) { *pio_dev = ic->dev; - PIO_CONFIGURE(*pio_dev, PIO_OUT_ALL, - PIO_UNMASK_ALL); return (0); } }