summaryrefslogtreecommitdiff
path: root/sys/arch/arm64/conf
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2017-11-13 21:24:28 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2017-11-13 21:24:28 +0000
commit0731ebd7182102756256999a6ec042c57581d190 (patch)
tree3159a3b4baae32c75e097348b885500463c7ea8c /sys/arch/arm64/conf
parent8c3dab4cc2d78c018550f21581109161a560ce0b (diff)
Add support for the i2c controller variant found on the Allwinner A31 and
above and enable the driver on arm64. From Artturi Alm. Tested by Stephen Graf.
Diffstat (limited to 'sys/arch/arm64/conf')
-rw-r--r--sys/arch/arm64/conf/GENERIC4
-rw-r--r--sys/arch/arm64/conf/RAMDISK4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index 7a5742c3f1e..7648611c275 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.41 2017/10/24 17:00:34 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.42 2017/11/13 21:24:27 kettenis Exp $
#
# GENERIC machine description file
#
@@ -104,6 +104,8 @@ sxiccmu* at fdt? early 1 # Clock Control Module/Unit
sxirtc* at fdt? # Real Time Clock
sximmc* at fdt? # SD/MMC card controller
sdmmc* at sximmc? # SD/MMC bus
+sxitwi* at fdt? # I2C controller
+iic* at sxitwi? # I2C bus
dwxe* at fdt?
# PCI
diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index a023c37df01..bbeecb6d752 100644
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.38 2017/10/24 17:00:34 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.39 2017/11/13 21:24:27 kettenis Exp $
#
# GENERIC machine description file
#
@@ -114,6 +114,8 @@ sxiccmu* at fdt? early 1 # Clock Control Module/Unit
sxirtc* at fdt? # Real Time Clock
sximmc* at fdt? # SD/MMC card controller
sdmmc* at sximmc? # SD/MMC bus
+sxitwi* at fdt? # I2C controller
+iic* at sxitwi? # I2C bus
dwxe* at fdt?
# PCI