Add and enable FDT glue for ARM PrimeCell PL050 (KMI) PS2 keyboard/mouse

interface.

sys/arch/arm/fdt/files.fdt

@@ -1,4 +1,6 @@
-# $NetBSD: files.fdt,v 1.8 2017/06/03 14:50:39 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.9 2017/06/03 17:05:23 jmcneill Exp $
+
+include	"dev/pckbport/files.pckbport"
 
 device	armfdt { }: bus_space_generic, fdtbus
 attach	armfdt at root with arm_fdt
@@ -21,6 +23,9 @@ file	arch/arm/fdt/plcom_fdt.c		plcom_fdt
 attach	genfb at fdt with plfb_fdt: fdt_display_timing
 file	arch/arm/fdt/plfb_fdt.c			plfb_fdt
 
+attach	plkmi at fdt with plkmi_fdt
+file	arch/arm/fdt/plkmi_fdt.c		plkmi_fdt
+
 attach	plmmc at fdt with plmmc_fdt
 file	arch/arm/fdt/plmmc_fdt.c		plmmc_fdt
 

sys/arch/arm/fdt/plkmi_fdt.c

@@ -0,0 +1,105 @@
+/* $NetBSD: plkmi_fdt.c,v 1.1 2017/06/03 17:05:23 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: plkmi_fdt.c,v 1.1 2017/06/03 17:05:23 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <dev/fdt/fdtvar.h>
+
+#include <dev/ic/pl050var.h>
+
+static int	plkmi_fdt_match(device_t, cfdata_t, void *);
+static void	plkmi_fdt_attach(device_t, device_t, void *);
+
+static const char * const compatible[] = {
+	"arm,pl050",
+	NULL
+};
+
+CFATTACH_DECL_NEW(plkmi_fdt, sizeof(struct plkmi_softc),
+	plkmi_fdt_match, plkmi_fdt_attach, NULL, NULL);
+
+static int
+plkmi_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
+	struct fdt_attach_args * const faa = aux;
+
+	return of_compatible(faa->faa_phandle, compatible) >= 0;
+}
+
+static void
+plkmi_fdt_attach(device_t parent, device_t self, void *aux)
+{
+	struct plkmi_softc * const sc = device_private(self);
+	struct fdt_attach_args * const faa = aux;
+	const int phandle = faa->faa_phandle;
+	char intrstr[128];
+	struct clk *clk;
+	bus_addr_t addr;
+	bus_size_t size;
+	void *ih;
+
+	if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+		aprint_error(": missing 'reg' property\n");
+		return;
+	}
+
+	if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
+		aprint_error_dev(self, "failed to decode interrupt\n");
+		return;
+	}
+
+
+	for (int i = 0; (clk = fdtbus_clock_get_index(phandle, i)); i++)
+		if (clk_enable(clk) != 0) {
+			aprint_error(": couldn't enable clock #%d\n", i);
+			return;
+		}
+
+	sc->sc_dev = self;
+	sc->sc_bst = faa->faa_bst;
+	if (bus_space_map(faa->faa_bst, addr, size, 0, &sc->sc_bsh)) {
+		aprint_error(": couldn't map device\n");
+		return;
+	}
+
+	plkmi_attach(sc);
+
+	ih = fdtbus_intr_establish(phandle, 0, IPL_TTY, 0, plkmi_intr, sc);
+	if (ih == NULL) {
+		aprint_error_dev(self, "couldn't install interrupt handler\n");
+		return;
+	}
+	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
+}

sys/arch/evbarm/conf/VEXPRESS_A15

@@ -1,5 +1,5 @@
 #
-#	$NetBSD: VEXPRESS_A15,v 1.11 2017/06/03 14:51:15 jmcneill Exp $
+#	$NetBSD: VEXPRESS_A15,v 1.12 2017/06/03 17:05:23 jmcneill Exp $
 #
 #	ARM Versatile Express A15
 #
@@ -77,7 +77,16 @@ options 	WSDISPLAY_COMPAT_SYSCONS
 options 	WSDISPLAY_COMPAT_USL
 options 	WSDISPLAY_COMPAT_RAWKBD
 options 	WSDISPLAY_DEFAULTSCREENS=4
-pseudo-device	wsmux
+
+# PS/2 keyboard and mouse support
+plkmi*		at fdt?
+pckbd*		at pckbport?
+wskbd*		at pckbd? console ?
+pms*		at pckbport?
+wsmouse*	at pms? mux 0
+
+# wscons pseudo-devices
 pseudo-device	wsfont
+pseudo-device	wsmux
 
 cinclude "arch/evbarm/conf/VEXPRESS_A15.local"