svn commit: r294131 - in head/sys: arm/at91 conf dev/usb/controller

[Warner Losh]

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