Turn ehci(4) glue code for the i.MX6 platform into its own imxehci(4) driver

such that we can don't end up with conflicting attachments of other
SoC-specific glue code.

ok jsg@, patrick@

diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index 349ef3a..9203478 100644 (file)
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.29 2016/07/10 14:01:10 kettenis Exp $
+#      $OpenBSD: GENERIC,v 1.30 2016/07/12 15:16:00 kettenis Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -52,8 +52,8 @@ iic*          at imxiic?
 imxesdhc*      at fdt?                 # SDHC controller
 sdmmc*         at imxesdhc?            # SD/MMC bus
 ahci*          at fdt?                 # AHCI/SATA
-ehci*          at fdt?                 # EHCI (shim)
-usb*           at ehci?
+imxehci*       at fdt?                 # EHCI
+usb*           at imxehci?
 
 # OMAP3xxx/OMAP4xxx SoC
 omap0          at mainbus?

diff --git a/sys/arch/armv7/imx/files.imx b/sys/arch/armv7/imx/files.imx
index 952f051..15c0fd6 100644 (file)
--- a/sys/arch/armv7/imx/files.imx
+++ b/sys/arch/armv7/imx/files.imx
@@ -1,4 +1,4 @@
-#      $OpenBSD: files.imx,v 1.13 2016/07/10 14:01:10 kettenis Exp $
+#      $OpenBSD: files.imx,v 1.14 2016/07/12 15:16:00 kettenis Exp $
 
 define imx {}
 device imx: imx
@@ -40,7 +40,8 @@ device fec: ether, ifnet, mii, ifmedia
 attach fec at fdt
 file   arch/armv7/imx/if_fec.c         fec
 
-attach ehci at fdt with imxehci
+device imxehci: usbus
+attach imxehci at fdt
 file   arch/armv7/imx/imxehci.c                imxehci
 
 device imxesdhc: sdmmcbus

diff --git a/sys/arch/armv7/imx/imxehci.c b/sys/arch/armv7/imx/imxehci.c
index f83a692..b7abfab 100644 (file)
--- a/sys/arch/armv7/imx/imxehci.c
+++ b/sys/arch/armv7/imx/imxehci.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: imxehci.c,v 1.11 2016/07/10 11:46:28 kettenis Exp $ */
+/*     $OpenBSD: imxehci.c,v 1.12 2016/07/12 15:16:00 kettenis Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -94,6 +94,10 @@ struct cfattach imxehci_ca = {
        imxehci_detach
 };
 
+struct cfdriver imxehci_cd = {
+       NULL, "imxehci", DV_DULL
+};
+
 int
 imxehci_match(struct device *parent, void *match, void *aux)
 {