diff options
| author | ian <ian@FreeBSD.org> | 2013-12-14 00:58:13 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2013-12-14 00:58:13 +0000 |
| commit | c3017e92252af5d5b10ef677850937077a3890ec (patch) | |
| tree | 1cd7a2ddbdfdd8a9d8f6bada5d23dbc2eab0d42c /sys/arm | |
| parent | af5e386ba3e26c97f36f879185c6303c6e5e531b (diff) | |
| download | FreeBSD-src-c3017e92252af5d5b10ef677850937077a3890ec.zip FreeBSD-src-c3017e92252af5d5b10ef677850937077a3890ec.tar.gz | |
MFC r258356:
Bugfixes... the host capabilties from FDT data are stored in host.caps, not
host.host_ocr, examine the correct field when setting up the hardware. Also,
the offset for the capabilties register should be 0x140, not 0x240.
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/ti/ti_sdhci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c index 6ea6110..218983b 100644 --- a/sys/arm/ti/ti_sdhci.c +++ b/sys/arm/ti/ti_sdhci.c @@ -108,7 +108,7 @@ static struct ofw_compat_data compat_data[] = { #define MMCHS_CON 0x02C #define MMCHS_CON_DW8 (1 << 5) #define MMCHS_CON_DVAL_8_4MS (3 << 9) -#define MMCHS_SD_CAPA 0x240 +#define MMCHS_SD_CAPA 0x140 #define MMCHS_SD_CAPA_VS18 (1 << 26) #define MMCHS_SD_CAPA_VS30 (1 << 25) #define MMCHS_SD_CAPA_VS33 (1 << 24) @@ -432,9 +432,9 @@ ti_sdhci_attach(device_t dev) * that it can set the right values in the CAPA register, which can only * be done once and never reset. */ - sc->slot.host.host_ocr |= MMC_OCR_LOW_VOLTAGE; + sc->slot.host.caps |= MMC_OCR_LOW_VOLTAGE; if (sc->mmchs_device_id == 0 || OF_hasprop(node, "ti,dual-volt")) { - sc->slot.host.host_ocr |= MMC_OCR_290_300 | MMC_OCR_300_310; + sc->slot.host.caps |= MMC_OCR_290_300 | MMC_OCR_300_310; } /* |
