Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Initial import of an SD/MMC driver for the Winbond W83L5...
details: https://anonhg.NetBSD.org/src/rev/48ec87261e73
branches: trunk
changeset: 747741:48ec87261e73
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Wed Sep 30 20:44:49 2009 +0000
description:
Initial import of an SD/MMC driver for the Winbond W83L518D (and probably
W83L519D) Integrated Media Reader with PNP bus attachment glue.
diffstat:
sys/conf/files | 7 +-
sys/dev/acpi/files.acpi | 6 +-
sys/dev/acpi/wb_acpi.c | 159 ++++++++++++
sys/dev/ic/w83l518d.c | 139 ++++++++++
sys/dev/ic/w83l518d_sdmmc.c | 576 ++++++++++++++++++++++++++++++++++++++++++++
sys/dev/ic/w83l518d_sdmmc.h | 35 ++
sys/dev/ic/w83l518dreg.h | 168 ++++++++++++
sys/dev/ic/w83l518dvar.h | 59 ++++
8 files changed, 1147 insertions(+), 2 deletions(-)
diffs (truncated from 1198 to 300 lines):
diff -r 2d96604b2ffb -r 48ec87261e73 sys/conf/files
--- a/sys/conf/files Wed Sep 30 18:22:29 2009 +0000
+++ b/sys/conf/files Wed Sep 30 20:44:49 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.957 2009/09/26 19:05:07 jakllsch Exp $
+# $NetBSD: files,v 1.958 2009/09/30 20:44:49 jmcneill Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20090313
@@ -1147,6 +1147,11 @@
device sdhc: sdmmcbus
file dev/sdmmc/sdhc.c sdhc needs-flag
+# Winbond Integrated Media Reader
+device wb: sdmmcbus
+file dev/ic/w83l518d.c wb
+file dev/ic/w83l518d_sdmmc.c wb
+
# Myson MTD803 3-in-1 Fast Ethernet Controller
device mtd: arp, ether, ifnet, mii
file dev/ic/mtd803.c mtd
diff -r 2d96604b2ffb -r 48ec87261e73 sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi Wed Sep 30 18:22:29 2009 +0000
+++ b/sys/dev/acpi/files.acpi Wed Sep 30 20:44:49 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.58 2009/08/31 14:48:41 cube Exp $
+# $NetBSD: files.acpi,v 1.59 2009/09/30 20:44:50 jmcneill Exp $
include "dev/acpi/acpica/files.acpica"
@@ -141,3 +141,7 @@
device acpidalb
attach acpidalb at acpinodebus
file dev/acpi/dalb_acpi.c acpidalb
+
+# Winbond Integrated Media Reader
+attach wb at acpinodebus with wb_acpi
+file dev/acpi/wb_acpi.c wb_acpi
diff -r 2d96604b2ffb -r 48ec87261e73 sys/dev/acpi/wb_acpi.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/acpi/wb_acpi.c Wed Sep 30 20:44:49 2009 +0000
@@ -0,0 +1,159 @@
+/* $NetBSD: wb_acpi.c,v 1.1 2009/09/30 20:44:50 jmcneill Exp $ */
+
+/*
+ * Copyright (c) 2009 Jared D. McNeill <jmcneill%invisible.ca@localhost>
+ * 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. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * 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: wb_acpi.c,v 1.1 2009/09/30 20:44:50 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/syslog.h>
+#include <sys/device.h>
+#include <sys/proc.h>
+
+#include <sys/bus.h>
+
+#include <dev/isa/isavar.h>
+#include <dev/isa/isadmavar.h>
+
+#include <dev/acpi/acpica.h>
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+
+#include <dev/sdmmc/sdmmcvar.h>
+#include <dev/ic/w83l518dvar.h>
+#include <dev/ic/w83l518dreg.h>
+
+static int wb_acpi_match(device_t, cfdata_t, void *);
+static void wb_acpi_attach(device_t, device_t, void *);
+static int wb_acpi_detach(device_t, int);
+
+struct wb_acpi_softc {
+ struct wb_softc sc_wb;
+ isa_chipset_tag_t sc_ic;
+ void *sc_ih;
+ int sc_ioh_length;
+};
+
+CFATTACH_DECL_NEW(wb_acpi, sizeof(struct wb_acpi_softc),
+ wb_acpi_match,
+ wb_acpi_attach,
+ wb_acpi_detach,
+ NULL
+);
+
+static const char * const wb_acpi_ids[] = {
+#if notyet
+ "WEC0515", /* Memory Stick interface */
+#endif
+ "WEC0517", /* SD Memory Card interface */
+ NULL
+};
+
+static int
+wb_acpi_match(device_t parent, cfdata_t match, void *opaque)
+{
+ struct acpi_attach_args *aa = opaque;
+
+ if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
+ return 0;
+
+ return acpi_match_hid(aa->aa_node->ad_devinfo, wb_acpi_ids);
+}
+
+static void
+wb_acpi_attach(device_t parent, device_t self, void *opaque)
+{
+ struct wb_acpi_softc *sc = device_private(self);
+ struct acpi_attach_args *aa = opaque;
+ struct acpi_resources res;
+ struct acpi_io *io;
+ struct acpi_irq *irq;
+ bus_space_handle_t ioh;
+ ACPI_STATUS rv;
+
+ sc->sc_ic = aa->aa_ic;
+
+ rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
+ &res, &acpi_resource_parse_ops_default);
+ if (ACPI_FAILURE(rv))
+ return;
+
+ io = acpi_res_io(&res, 0);
+ irq = acpi_res_irq(&res, 0);
+ if (io == NULL || irq == NULL) {
+ aprint_error_dev(self, "incomplete resources\n");
+ goto cleanup;
+ }
+
+ if (bus_space_map(aa->aa_iot, io->ar_base, io->ar_length, 0, &ioh)) {
+ aprint_error_dev(self, "couldn't map registers\n");
+ goto cleanup;
+ }
+ sc->sc_ioh_length = io->ar_length;
+
+ sc->sc_ih = isa_intr_establish(sc->sc_ic, irq->ar_irq,
+ (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL,
+ IPL_SDMMC, wb_intr, &sc->sc_wb);
+ if (sc->sc_ih == NULL) {
+ aprint_error_dev(self,
+ "couldn't establish interrupt handler\n");
+ goto cleanup;
+ }
+
+ sc->sc_wb.wb_dev = self;
+ sc->sc_wb.wb_type = WB_DEVNO_SD;
+ sc->sc_wb.wb_iot = aa->aa_iot;
+ sc->sc_wb.wb_ioh = ioh;
+ sc->sc_wb.wb_irq = irq->ar_irq;
+ sc->sc_wb.wb_base = io->ar_base;
+ wb_attach(&sc->sc_wb);
+
+cleanup:
+ acpi_resource_cleanup(&res);
+}
+
+static int
+wb_acpi_detach(device_t self, int flags)
+{
+ struct wb_acpi_softc *sc = device_private(self);
+ int rv;
+
+ rv = wb_detach(&sc->sc_wb, flags);
+ if (rv)
+ return rv;
+
+ if (sc->sc_ih)
+ isa_intr_disestablish(sc->sc_ic, sc->sc_ih);
+
+ if (sc->sc_ioh_length > 0)
+ bus_space_unmap(sc->sc_wb.wb_iot, sc->sc_wb.wb_ioh,
+ sc->sc_ioh_length);
+
+ return 0;
+}
diff -r 2d96604b2ffb -r 48ec87261e73 sys/dev/ic/w83l518d.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/ic/w83l518d.c Wed Sep 30 20:44:49 2009 +0000
@@ -0,0 +1,139 @@
+/* $NetBSD: w83l518d.c,v 1.1 2009/09/30 20:44:50 jmcneill Exp $ */
+
+/*
+ * Copyright (c) 2009 Jared D. McNeill <jmcneill%invisible.ca@localhost>
+ * 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. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * 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: w83l518d.c,v 1.1 2009/09/30 20:44:50 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/syslog.h>
+#include <sys/device.h>
+#include <sys/proc.h>
+
+#include <sys/bus.h>
+
+#include <dev/isa/isavar.h>
+#include <dev/isa/isadmavar.h>
+
+#include <dev/ic/w83l518dreg.h>
+#include <dev/ic/w83l518dvar.h>
+#include <dev/ic/w83l518d_sdmmc.h>
+
+uint8_t
+wb_idx_read(struct wb_softc *wb, uint8_t reg)
+{
+ bus_space_write_1(wb->wb_iot, wb->wb_ioh, WB_SD_INDEX, reg);
+ return bus_space_read_1(wb->wb_iot, wb->wb_ioh, WB_SD_DATA);
+}
+
+void
+wb_idx_write(struct wb_softc *wb, uint8_t reg, uint8_t val)
+{
+ bus_space_write_1(wb->wb_iot, wb->wb_ioh, WB_SD_INDEX, reg);
+ bus_space_write_1(wb->wb_iot, wb->wb_ioh, WB_SD_DATA, val);
+}
+
+uint8_t
+wb_read(struct wb_softc *wb, uint8_t reg)
+{
+ return bus_space_read_1(wb->wb_iot, wb->wb_ioh, reg);
+}
+
+void
+wb_write(struct wb_softc *wb, uint8_t reg, uint8_t val)
+{
+ bus_space_write_1(wb->wb_iot, wb->wb_ioh, reg, val);
+}
+
+void
+wb_led(struct wb_softc *wb, bool enable)
+{
+ uint8_t val;
+
+ val = wb_read(wb, WB_SD_CSR);
+ if (enable)
+ val |= WB_CSR_MS_LED;
+ else
+ val &= ~WB_CSR_MS_LED;
+ wb_write(wb, WB_SD_CSR, val);
+}
+
+void
+wb_attach(struct wb_softc *wb)
+{
+ switch (wb->wb_type) {
+ case WB_DEVNO_SD:
+ aprint_verbose_dev(wb->wb_dev,
+ "SD/MMC Reader\n");
+ wb_sdmmc_attach(wb);
Home |
Main Index |
Thread Index |
Old Index