switch from ompinmux to pinctrl

ok kettenis@

diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index b054a3a..bbad1ba 100644 (file)
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.119 2018/08/22 15:38:46 mpi Exp $
+#      $OpenBSD: GENERIC,v 1.120 2018/08/27 10:05:18 jsg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -73,7 +73,7 @@ intc*         at fdt?                 # OMAP3 interrupt controller
 omwugen*       at fdt?                 # Wake-up generator
 #edma*         at fdt?                 # OMAP3 dma controller
 prcm*          at omap?                # power/clock controller
-ompinmux*      at fdt?                 # pin muxing
+pinctrl*       at fdt?                 # pin muxing
 omdog*         at fdt?                 # watchdog timer
 omgpio*                at fdt?                 # user-visible GPIO pins?
 gpio*          at omgpio?

diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK
index f1d6c19..9199aeb 100644 (file)
--- a/sys/arch/armv7/conf/RAMDISK
+++ b/sys/arch/armv7/conf/RAMDISK
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISK,v 1.105 2018/08/05 13:20:58 jsg Exp $
+#      $OpenBSD: RAMDISK,v 1.106 2018/08/27 10:05:18 jsg Exp $
 
 machine                armv7 arm
 
@@ -69,7 +69,7 @@ intc*         at fdt?                 # OMAP3 interrupt controller
 omwugen*       at fdt?                 # Wake-up generator
 #edma*         at fdt?                 # OMAP3 dma controller
 prcm*          at omap?                # power/clock controller
-ompinmux*      at fdt?                 # pin muxing
+pinctrl*       at fdt?                 # pin muxing
 omdog*         at fdt?                 # watchdog timer
 omgpio*                at fdt?                 # user-visible GPIO pins?
 gpio*          at omgpio?