From owner-svn-src-head@freebsd.org Sat Jan 16 04:47:34 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 795E2A6DB30; Sat, 16 Jan 2016 04:47:34 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 348B41180; Sat, 16 Jan 2016 04:47:34 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0G4lXqf014984; Sat, 16 Jan 2016 04:47:33 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0G4lWn6014980; Sat, 16 Jan 2016 04:47:32 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201601160447.u0G4lWn6014980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 16 Jan 2016 04:47:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294131 - in head/sys: arm/at91 conf dev/usb/controller X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2016 04:47:34 -0000 Author: imp Date: Sat Jan 16 04:47:32 2016 New Revision: 294131 URL: https://svnweb.freebsd.org/changeset/base/294131 Log: Move ohci files to their proper place in the tree for atmel. Fix when it is included (we don't have a at91rm9200 device). From a similar patch in the PR, with tweaked names. PR: 206229 Added: head/sys/arm/at91/at91_ohci.c - copied, changed from r294122, head/sys/dev/usb/controller/ohci_atmelarm.c head/sys/arm/at91/at91_ohci_fdt.c - copied, changed from r294122, head/sys/dev/usb/controller/ohci_fdt.c Deleted: head/sys/dev/usb/controller/ohci_atmelarm.c head/sys/dev/usb/controller/ohci_fdt.c Modified: head/sys/arm/at91/files.at91 head/sys/conf/files Copied and modified: head/sys/arm/at91/at91_ohci.c (from r294122, head/sys/dev/usb/controller/ohci_atmelarm.c) ============================================================================== Copied and modified: head/sys/arm/at91/at91_ohci_fdt.c (from r294122, head/sys/dev/usb/controller/ohci_fdt.c) ============================================================================== Modified: head/sys/arm/at91/files.at91 ============================================================================== --- head/sys/arm/at91/files.at91 Sat Jan 16 04:41:40 2016 (r294130) +++ head/sys/arm/at91/files.at91 Sat Jan 16 04:47:32 2016 (r294131) @@ -9,6 +9,8 @@ arm/at91/at91_smc.c standard arm/at91/at91_cfata.c optional at91_cfata arm/at91/at91_common.c optional fdt arm/at91/at91_mci.c optional at91_mci +arm/at91/at91_ohci.c optional ohci ! fdt +arm/at91/at91_ohci_fdt.c optional ohci fdt arm/at91/at91_pinctrl.c optional fdt fdt_pinctrl arm/at91/at91_pit.c optional at91sam9 arm/at91/at91_reset.S optional at91sam9 @@ -58,8 +60,11 @@ arm/at91/board_tsc4370.c optional at91_b # # usb # +# XXX these should likely move to sys/at91 as well. They are also +# XXX slightly inconsistent with sys/conf/files and that ambiguity +# XXX should be fixed when this can be tested on real kit. The dci +# XXX code has hard-coded GPIO pins which is almost certainly wrong. dev/usb/controller/at91dci.c optional at91_dci -dev/usb/controller/at91dci_atmelarm.c optional at91_dci !fdt -dev/usb/controller/ohci_atmelarm.c optional ohci !fdt +dev/usb/controller/at91dci_atmelarm.c optional at91_dci ! fdt dev/usb/controller/at91dci_fdt.c optional at91_dci fdt -dev/usb/controller/ohci_fdt.c optional ohci fdt + Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sat Jan 16 04:41:40 2016 (r294130) +++ head/sys/conf/files Sat Jan 16 04:47:32 2016 (r294131) @@ -2561,7 +2561,6 @@ dev/usb/controller/dwc_otg_fdt.c optiona dev/usb/controller/ehci.c optional ehci dev/usb/controller/ehci_pci.c optional ehci pci dev/usb/controller/ohci.c optional ohci -dev/usb/controller/ohci_atmelarm.c optional ohci at91rm9200 dev/usb/controller/ohci_pci.c optional ohci pci dev/usb/controller/uhci.c optional uhci dev/usb/controller/uhci_pci.c optional uhci pci