summaryrefslogtreecommitdiff
path: root/sys/arch/evbarm
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-11-20 16:49:58 +0000
committermartin <martin@NetBSD.org>2019-11-20 16:49:58 +0000
commitd29c34c103f56ea6e86032093fa0a6e59eb9920a (patch)
tree8362d99b36b70c4e637e9d96c681ce7fb111c88f /sys/arch/evbarm
parent8c52ebf8ab97faf41a98187160e7ff86e31548e1 (diff)
Pull up following revision(s) (requested by tnn in ticket #458):
sys/arch/arm/rockchip/rk3399_cru.c: revision 1.9 sys/arch/arm/rockchip/rk_spi.c: revision 1.1 sys/arch/evbarm/conf/GENERIC64: revision 1.104 sys/arch/arm/rockchip/files.rockchip: revision 1.20 rk3399_cru: add definitions for SPI clocks rk_spi: Rockchip SPI driver Match only on RK3399 for now, but should work on RK3328 as well with the proper CRU support. If you can, please test and enable for RK3328. rkspi* at fdt?
Diffstat (limited to 'sys/arch/evbarm')
-rw-r--r--sys/arch/evbarm/conf/GENERIC643
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/evbarm/conf/GENERIC64 b/sys/arch/evbarm/conf/GENERIC64
index ec84ca7c2f2..720fb517b0c 100644
--- a/sys/arch/evbarm/conf/GENERIC64
+++ b/sys/arch/evbarm/conf/GENERIC64
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.103.2.5 2019/11/18 19:36:03 martin Exp $
+# $NetBSD: GENERIC64,v 1.103.2.6 2019/11/20 16:49:58 martin Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -402,6 +402,7 @@ ld* at nvme? nsid ?
# SPI controllers
bcmspi* at fdt? # Broadcom BCM283x SPI
+rkspi* at fdt? # Rockchip SPI
sun6ispi* at fdt? # Allwinner SPI
spi* at spibus?