diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-10-08 07:58:24 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-10-08 07:58:24 +0000 |
| commit | 95013f65a5e37baf46ed1251b96a0bb579d426ad (patch) | |
| tree | 3ff08233878a8215fc8b835ca7330150556d4583 | |
| parent | 0f071b8e22e8a2cb78100de99e5896cdc3b5e691 (diff) | |
Enable rkiic(4) and rkpmic(4) for Rockchip RK3288 boards.
ok patrick@, jsg@
| -rw-r--r-- | sys/arch/armv7/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/dev/fdt/rkiic.c | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index 6b1269fba76..da04e636a23 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.95 2017/09/21 12:11:29 patrick Exp $ +# $OpenBSD: GENERIC,v 1.96 2017/10/08 07:58:23 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -168,6 +168,8 @@ rkclock* at fdt? early 1 rkgrf* at fdt? early 1 rkpinctrl* at fdt? early 1 rkgpio* at fdt? +rkiic* at fdt? +iic* at rkiic? dwdog* at fdt? axppmic* at iic? # axp209 pmic @@ -175,6 +177,7 @@ crosec* at iic? wskbd* at crosec? mux 1 pcfrtc* at iic? pcxrtc* at iic? +rkpmic* at iic? # RK808 PMIC tpspmic* at iic? # virtio devices diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK index 7e528c14f85..3425affaabc 100644 --- a/sys/arch/armv7/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.89 2017/09/21 12:11:29 patrick Exp $ +# $OpenBSD: RAMDISK,v 1.90 2017/10/08 07:58:23 kettenis Exp $ machine armv7 arm @@ -162,6 +162,8 @@ rkclock* at fdt? early 1 rkgrf* at fdt? early 1 rkpinctrl* at fdt? early 1 rkgpio* at fdt? +rkiic* at fdt? +iic* at rkiic? dwdog* at fdt? axppmic* at iic? # axp209 pmic @@ -169,6 +171,7 @@ crosec* at iic? wskbd* at crosec? mux 1 pcfrtc* at iic? pcxrtc* at iic? +rkpmic* at iic? # RK808 PMIC tpspmic* at iic? # virtio devices diff --git a/sys/dev/fdt/rkiic.c b/sys/dev/fdt/rkiic.c index 0260f96fd8a..adc7fdc24fa 100644 --- a/sys/dev/fdt/rkiic.c +++ b/sys/dev/fdt/rkiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rkiic.c,v 1.1 2017/08/27 22:09:21 kettenis Exp $ */ +/* $OpenBSD: rkiic.c,v 1.2 2017/10/08 07:58:23 kettenis Exp $ */ /* * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org> * @@ -108,7 +108,8 @@ rkiic_match(struct device *parent, void *match, void *aux) { struct fdt_attach_args *faa = aux; - return OF_is_compatible(faa->fa_node, "rockchip,rk3399-i2c"); + return (OF_is_compatible(faa->fa_node, "rockchip,rk3288-i2c") || + OF_is_compatible(faa->fa_node, "rockchip,rk3399-i2c")); } void |