Properly implement the rsb attribute and actually use it.

diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index a9a5812..7239fae 100644 (file)
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.101 2017/12/18 10:51:24 kettenis Exp $
+#      $OpenBSD: GENERIC,v 1.102 2017/12/18 20:23:16 kettenis Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -92,8 +92,8 @@ gpio*         at sxipio?
 sxiccmu*       at fdt? early 1         # Clock Control Module/Unit
 sxitimer*      at fdt? early 1
 sxirsb*                at fdt? early 1         # Reduced Serial Bus
-acrtc*         at sxirsb?
-axppmic*       at sxirsb?
+acrtc*         at rsb?
+axppmic*       at rsb?
 sxidog*                at fdt?                 # watchdog timer
 sxirtc*                at fdt?                 # Real Time Clock
 sxie*          at fdt?

diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK
index f5a98bd..921b043 100644 (file)
--- a/sys/arch/armv7/conf/RAMDISK
+++ b/sys/arch/armv7/conf/RAMDISK
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISK,v 1.93 2017/12/16 10:22:13 kettenis Exp $
+#      $OpenBSD: RAMDISK,v 1.94 2017/12/18 20:23:16 kettenis Exp $
 
 machine                armv7 arm
 
@@ -88,7 +88,8 @@ gpio*         at sxipio?
 sxiccmu*       at fdt? early 1         # Clock Control Module/Unit
 sxitimer*      at fdt? early 1
 sxirsb*                at fdt? early 1         # Reduced Serial Bus
-acrtc*         at sxirsb?
+acrtc*         at rsb?
+axppmic*       at rsb?
 sxidog*                at fdt?                 # watchdog timer
 sxirtc*                at fdt?                 # Real Time Clock
 sxie*          at fdt?

diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index 99f7deb..29911b4 100644 (file)
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-#      $OpenBSD: files.fdt,v 1.31 2017/12/18 19:40:12 kettenis Exp $
+#      $OpenBSD: files.fdt,v 1.32 2017/12/18 20:23:16 kettenis Exp $
 #
 # Config file and device description for machine-independent FDT code.
 # Included by ports that need it.
@@ -15,8 +15,8 @@ device        sxipio {}: gpiobus
 attach sxipio at fdt
 file   dev/fdt/sxipio.c                sxipio
 
-define rsb
-device sxirsb {}: rsb
+define rsb {}
+device sxirsb: rsb
 attach sxirsb at fdt
 file   dev/fdt/sxirsb.c                sxirsb
 
@@ -34,7 +34,7 @@ file  dev/fdt/sxitwi.c                sxitwi
 
 device axppmic
 attach axppmic at i2c
-attach axppmic at sxirsb with axppmic_rsb
+attach axppmic at rsb with axppmic_rsb
 file   dev/fdt/axppmic.c               axppmic
 
 device bcmaux
@@ -139,5 +139,5 @@ attach      dwxe at fdt
 file   dev/fdt/if_dwxe.c               dwxe
 
 device acrtc
-attach acrtc at sxirsb
+attach acrtc at rsb
 file   dev/fdt/acrtc.c                 acrtc
\ No newline at end of file