summaryrefslogtreecommitdiff
path: root/sys/arch/armv7/conf
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2016-09-23 17:59:18 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2016-09-23 17:59:18 +0000
commit0200cb17a3d4fb5a75ede843a1c2baea61e9dc73 (patch)
tree832e129a5ad8143421be1c37766cfa690860739f /sys/arch/armv7/conf
parent493b812b9efe565243b12a40020c3aff61ad35dc (diff)
Attach imxocotp(4) using the fdt. Since this means that imxtemp(4) attaches
before imxocotp(4), delay reading the temperature sensor calibration information until after imxocotp(4) attaches.
Diffstat (limited to 'sys/arch/armv7/conf')
-rw-r--r--sys/arch/armv7/conf/GENERIC4
-rw-r--r--sys/arch/armv7/conf/RAMDISK4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index 04df3bdcb4e..49a90ad6816 100644
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.55 2016/09/18 18:16:00 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.56 2016/09/23 17:59:17 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -40,9 +40,9 @@ armliicc* at cortex?
# iMX
imx0 at mainbus? # iMX SoC
-imxocotp* at imx? # on-chip otp controller
imxccm* at fdt? early 1 # clock control module
imxiomuxc* at fdt? early 1 # iomux controller
+imxocotp* at fdt? # on-chip otp controller
imxgpc* at fdt? # power controller
imxdog* at fdt? # watchdog timer
imxtemp* at fdt? # temperature monitor
diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK
index f2912e49883..5ac1004bb22 100644
--- a/sys/arch/armv7/conf/RAMDISK
+++ b/sys/arch/armv7/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.50 2016/09/18 18:16:00 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.51 2016/09/23 17:59:17 kettenis Exp $
machine armv7 arm
@@ -39,9 +39,9 @@ armliicc* at cortex?
# iMX
imx0 at mainbus? # iMX SoC
-imxocotp* at imx? # on-chip otp controller
imxccm* at fdt? early 1 # clock control module
imxiomuxc* at fdt? early 1 # iomux controller
+imxocotp* at fdt? # on-chip otp controller
imxgpc* at fdt? # power controller
imxdog* at fdt? # watchdog timer
imxgpio* at fdt? # user-visible GPIO pins?