Module Name: src
Committed By: matt
Date: Wed Dec 12 15:15:31 UTC 2012
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
Add sc_vendor_bus_clock hook
>From jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/sdmmc/sdhcvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.33 src/sys/dev/sdmmc/sdhc.c:1.34
--- src/sys/dev/sdmmc/sdhc.c:1.33 Wed Dec 12 06:24:01 2012
+++ src/sys/dev/sdmmc/sdhc.c Wed Dec 12 15:15:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.33 2012/12/12 06:24:01 riastradh Exp $ */
+/* $NetBSD: sdhc.c,v 1.34 2012/12/12 15:15:31 matt Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.33 2012/12/12 06:24:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.34 2012/12/12 15:15:31 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -813,6 +813,12 @@ sdhc_bus_clock(sdmmc_chipset_handle_t sc
mutex_enter(&hp->host_mtx);
+ if (hp->sc->sc_vendor_bus_clock) {
+ error = (*hp->sc->sc_vendor_bus_clock)(hp->sc, freq);
+ if (error != 0)
+ goto out;
+ }
+
/*
* Stop SD clock before changing the frequency.
*/
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.9 src/sys/dev/sdmmc/sdhcvar.h:1.10
--- src/sys/dev/sdmmc/sdhcvar.h:1.9 Mon Oct 29 13:30:25 2012
+++ src/sys/dev/sdmmc/sdhcvar.h Wed Dec 12 15:15:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.9 2012/10/29 13:30:25 kiyohara Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.10 2012/12/12 15:15:31 matt Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -55,6 +55,7 @@ struct sdhc_softc {
int (*sc_vendor_rod)(struct sdhc_softc *, int);
int (*sc_vendor_write_protect)(struct sdhc_softc *);
int (*sc_vendor_card_detect)(struct sdhc_softc *);
+ int (*sc_vendor_bus_clock)(struct sdhc_softc *, int);
};
/* Host controller functions called by the attachment driver. */
