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

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

diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index 9203478..c3f0311 100644 (file)
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.30 2016/07/12 15:16:00 kettenis Exp $
+#      $OpenBSD: GENERIC,v 1.31 2016/07/12 19:17:49 kettenis Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -51,7 +51,7 @@ imxiic*               at fdt?                 # i2c
 iic*           at imxiic?
 imxesdhc*      at fdt?                 # SDHC controller
 sdmmc*         at imxesdhc?            # SD/MMC bus
-ahci*          at fdt?                 # AHCI/SATA
+imxahci*       at fdt?                 # AHCI/SATA
 imxehci*       at fdt?                 # EHCI
 usb*           at imxehci?
 

diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK
index 6412c5d..4a3c53e 100644 (file)
--- a/sys/arch/armv7/conf/RAMDISK
+++ b/sys/arch/armv7/conf/RAMDISK
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISK,v 1.27 2016/07/12 19:04:53 kettenis Exp $
+#      $OpenBSD: RAMDISK,v 1.28 2016/07/12 19:17:49 kettenis Exp $
 
 machine                armv7 arm
 
@@ -50,7 +50,7 @@ imxiic*               at fdt?                 # i2c
 iic*           at imxiic?
 imxesdhc*      at fdt?                 # SDHC controller
 sdmmc*         at imxesdhc?            # SD/MMC bus
-ahci*          at fdt?                 # AHCI/SATA
+imxahci*       at fdt?                 # AHCI/SATA
 imxehci*       at fdt?                 # EHCI
 usb*           at imxehci?
 

diff --git a/sys/arch/armv7/imx/files.imx b/sys/arch/armv7/imx/files.imx
index 15c0fd6..2014729 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.14 2016/07/12 15:16:00 kettenis Exp $
+#      $OpenBSD: files.imx,v 1.15 2016/07/12 19:17:49 kettenis Exp $
 
 define imx {}
 device imx: imx
@@ -48,5 +48,6 @@ device imxesdhc: sdmmcbus
 attach imxesdhc at fdt
 file   arch/armv7/imx/imxesdhc.c               imxesdhc
 
-attach ahci at fdt with imxahci
+device imxahci: scsi, atascsi
+attach imxahci at fdt
 file   arch/armv7/imx/imxahci.c                imxahci

diff --git a/sys/arch/armv7/imx/imxahci.c b/sys/arch/armv7/imx/imxahci.c
index 06badf1..6badbb3 100644 (file)
--- a/sys/arch/armv7/imx/imxahci.c
+++ b/sys/arch/armv7/imx/imxahci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxahci.c,v 1.4 2016/06/09 12:39:17 kettenis Exp $ */
+/* $OpenBSD: imxahci.c,v 1.5 2016/07/12 19:17:49 kettenis Exp $ */
 /*
  * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -95,7 +95,7 @@ struct cfattach imxahci_ca = {
 };
 
 struct cfdriver imxahci_cd = {
-       NULL, "ahci", DV_DULL
+       NULL, "imxahci", DV_DULL
 };
 
 int