Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the controller doesn't support switch func (opcode 6) then skip 

setting this but continue with other settings.  This allows us to use
a card, albeit at a lower speed.
This commit is contained in:
jdc 2020-05-11 09:51:47 +00:00
parent f21348ab88
commit a26bd5343b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/sdmmc/sdmmc_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sdmmc_mem.c,v 1.71 2020/01/04 22:28:26 mlelstv Exp $ */
/* $NetBSD: sdmmc_mem.c,v 1.72 2020/05/11 09:51:47 jdc Exp $ */
/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */
/*
@ -45,7 +45,7 @@
/* Routines for SD/MMC memory cards. */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.71 2020/01/04 22:28:26 mlelstv Exp $");
__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.72 2020/05/11 09:51:47 jdc Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@ -833,9 +833,14 @@ sdmmc_mem_sd_init(struct sdmmc_softc *sc, struct sdmmc_function *sf)
DPRINTF(("%s: switch func mode 0\n", SDMMCDEVNAME(sc)));
error = sdmmc_mem_sd_switch(sf, 0, 1, 0, &status);
if (error) {
aprint_error_dev(sc->sc_dev,
"switch func mode 0 failed\n");
return error;
if (error == ENOTSUP) {
/* Not supported by controller */
goto skipswitchfuncs;
} else {
aprint_error_dev(sc->sc_dev,
"switch func mode 0 failed\n");
return error;
}
}
support_func = SFUNC_STATUS_GROUP(&status, 1);
@ -887,6 +892,7 @@ sdmmc_mem_sd_init(struct sdmmc_softc *sc, struct sdmmc_function *sf)
delay(25);
}
}
skipswitchfuncs:
/* update bus clock */
if (sc->sc_busclk > sf->csd.tran_speed)