diff --git a/sys/dev/usb/controller/ohci_atmelarm.c b/sys/arm/at91/at91_ohci.c
similarity index 100%
rename from sys/dev/usb/controller/ohci_atmelarm.c
rename to sys/arm/at91/at91_ohci.c
diff --git a/sys/dev/usb/controller/ohci_fdt.c b/sys/arm/at91/at91_ohci_fdt.c
similarity index 100%
rename from sys/dev/usb/controller/ohci_fdt.c
rename to sys/arm/at91/at91_ohci_fdt.c
diff --git a/sys/arm/at91/files.at91 b/sys/arm/at91/files.at91
index 84056a4e1ed..46b20458c88 100644
--- a/sys/arm/at91/files.at91
+++ b/sys/arm/at91/files.at91
@@ -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_board_tsc4370
 #
 # 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
+
diff --git a/sys/conf/files b/sys/conf/files
index 3652b3b9f7d..ad2ea5e8a2b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2561,7 +2561,6 @@ dev/usb/controller/dwc_otg_fdt.c	optional dwcotg fdt
 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