Glue to attach the SD/MCC reader of the W83L519D found on some Tadpole

laptops.

3 files changed, 95 insertions, 2 deletions

diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index d597bd042ee..66b128d951f 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.244 2009/09/19 19:37:42 kettenis Exp $
+#	$OpenBSD: GENERIC,v 1.245 2009/10/03 19:56:14 kettenis Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -315,6 +315,9 @@ led*	at ebus?
 lom*	at ebus?
 pmc*	at ebus?
 ppm*	at ebus?
+wbsd*	at ebus?
+sdmmc*	at wbsd?
+scsibus* at sdmmc?
 
 # performance counters
 uperf*	at ebus?
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 3ff06f05cc6..8d3d664544b 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc64,v 1.127 2009/09/19 19:37:42 kettenis Exp $
+#	$OpenBSD: files.sparc64,v 1.128 2009/10/03 19:56:14 kettenis Exp $
 #	$NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
 
 # maxpartitions must be first item in files.${ARCH}
@@ -249,6 +249,9 @@ file	arch/sparc64/dev/ce4231.c		audioce
 
 file	arch/sparc64/dev/stp_sbus.c		stp_sbus
 
+attach	wbsd at ebus with wbsd_ebus
+file	arch/sparc64/dev/wbsd_ebus.c
+
 #
 # Console related stuff
 #
@@ -359,6 +362,11 @@ include "dev/i2c/files.i2c"
 file	arch/sparc64/dev/ofwi2c.c		i2cbus
 
 #
+# Machine-independent SD/MMC drivers
+#
+include "dev/sdmmc/files.sdmmc"
+
+#
 # Machine-independent USB drivers
 #
 include	"dev/usb/files.usb"
diff --git a/sys/arch/sparc64/dev/wbsd_ebus.c b/sys/arch/sparc64/dev/wbsd_ebus.c
new file mode 100644
index 00000000000..0b2f64fd48c
--- /dev/null
+++ b/sys/arch/sparc64/dev/wbsd_ebus.c
@@ -0,0 +1,82 @@
+/*	$OpenBSD: wbsd_ebus.c,v 1.1 2009/10/03 19:56:14 kettenis Exp $	*/
+/*
+ * Copyright (c) 2009 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/param.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+
+#include <machine/autoconf.h>
+#include <machine/openfirm.h>
+
+#include <sparc64/dev/ebusreg.h>
+#include <sparc64/dev/ebusvar.h>
+
+#include <dev/ic/w83l518dreg.h>
+#include <dev/ic/w83l518dvar.h>
+#include <dev/ic/w83l518d_sdmmc.h>
+
+int	wbsd_ebus_match(struct device *, void *, void *);
+void	wbsd_ebus_attach(struct device *, struct device *, void *);
+
+struct cfattach wbsd_ebus_ca = {
+	sizeof(struct wb_softc), wbsd_ebus_match, wbsd_ebus_attach
+};
+
+struct cfdriver wbsd_cd = {
+	NULL, "wbsd", DV_DULL
+};
+
+int
+wbsd_ebus_match(struct device *parent, void *match, void *aux)
+{
+	struct ebus_attach_args *ea = aux;
+
+	if (strcmp(ea->ea_name, "TAD,wb-sdcard") == 0)
+		return (1);
+
+	return (0);
+}
+
+void
+wbsd_ebus_attach(struct device *parent, struct device *self, void *aux)
+{
+	struct wb_softc *sc = (void *)self;
+	struct ebus_attach_args *ea = aux;
+
+	if (ebus_bus_map(ea->ea_iotag, 0,
+	    EBUS_PADDR_FROM_REG(&ea->ea_regs[0]),
+	    ea->ea_regs[0].size, 0, 0, &sc->wb_ioh) == 0) {
+		sc->wb_iot = ea->ea_iotag;
+	} else if (ebus_bus_map(ea->ea_memtag, 0,
+	    EBUS_PADDR_FROM_REG(&ea->ea_regs[0]),
+	    ea->ea_regs[0].size, 0, 0, &sc->wb_ioh) == 0) {
+		sc->wb_iot = ea->ea_memtag;
+	} else {
+		printf(": can't map register space\n");
+                return;
+	}
+
+	bus_intr_establish(sc->wb_iot, ea->ea_intrs[0], IPL_BIO, 0, wb_intr,
+	    sc, self->dv_xname);
+
+	printf("\n");
+
+	sc->wb_type = WB_DEVNO_SD;
+	wb_attach(sc);
+}