CVS commit: src/sys/arch/arm/allwinner

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Wed Feb 26 00:39:30 UTC 2014

Modified Files:
        src/sys/arch/arm/allwinner: awin_mmc.c

Log Message:
blink status LED during data transfers


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/allwinner/awin_mmc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/allwinner/awin_mmc.c
diff -u src/sys/arch/arm/allwinner/awin_mmc.c:1.1 src/sys/arch/arm/allwinner/awin_mmc.c:1.2
--- src/sys/arch/arm/allwinner/awin_mmc.c:1.1	Tue Feb 25 00:08:29 2014
+++ src/sys/arch/arm/allwinner/awin_mmc.c	Wed Feb 26 00:39:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_mmc.c,v 1.1 2014/02/25 00:08:29 jmcneill Exp $ */
+/* $NetBSD: awin_mmc.c,v 1.2 2014/02/26 00:39:30 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.1 2014/02/25 00:08:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.2 2014/02/26 00:39:30 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -93,6 +93,8 @@ struct awin_mmc_softc {
 	struct awin_gpio_pindata sc_gpio_detect;	/* card detect */
 	bool sc_has_gpio_wp;
 	struct awin_gpio_pindata sc_gpio_wp;		/* write protect */
+	bool sc_has_gpio_led;
+	struct awin_gpio_pindata sc_gpio_led;		/* LED */
 };
 
 CFATTACH_DECL_NEW(awin_mmc, sizeof(struct awin_mmc_softc),
@@ -189,6 +191,14 @@ awin_mmc_attach(device_t parent, device_
 			sc->sc_has_gpio_wp = true;
 		}
 	}
+	if (prop_dictionary_get_cstring_nocopy(cfg, "led-gpio", &pin_name)) {
+		if (!awin_gpio_pin_reserve(pin_name, &sc->sc_gpio_led)) {
+			aprint_error_dev(self,
+			    "failed to reserve GPIO \"%s\"\n", pin_name);
+		} else {
+			sc->sc_has_gpio_led = true;
+		}
+	}
 
 	awin_mmc_host_reset(sc);
 	awin_mmc_bus_width(sc, 1);
@@ -208,6 +218,14 @@ awin_mmc_attach(device_t parent, device_
 	sc->sc_sdmmc_dev = config_found(self, &saa, NULL);
 }
 
+static void
+awin_mmc_led(struct awin_mmc_softc *sc, int on)
+{
+	if (!sc->sc_has_gpio_led)
+		return;
+	awin_gpio_pindata_write(&sc->sc_gpio_led, on);
+}
+
 static int
 awin_mmc_host_reset(sdmmc_chipset_handle_t sch)
 {
@@ -448,7 +466,9 @@ awin_mmc_exec_command(sdmmc_chipset_hand
 		MMC_WRITE(sc, AWIN_MMC_CMD, cmdval | cmd->c_opcode);
 		cmd->c_resid = cmd->c_datalen;
 		cmd->c_buf = cmd->c_data;
+		awin_mmc_led(sc, 0);
 		cmd->c_error = awin_mmc_xfer_data(sc, cmd);
+		awin_mmc_led(sc, 1);
 		if (cmd->c_error) {
 			aprint_error_dev(sc->sc_dev,
 			    "xfer data timeout\n");