diff options
| author | Markus Niebel <Markus.Niebel@tqs.de> | 2014-01-10 10:05:33 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-10 14:56:58 +0100 |
| commit | 96da2169915df634e113e444c357d0cde7c054b8 (patch) | |
| tree | 422cc786fd05ca8433c1da4f069d093a7a84e367 /drivers/mci/mci-core.c | |
| parent | 98d5fd391544e21bbf13174f4ac1cc372ee7d604 (diff) | |
| download | barebox-96da2169915df634e113e444c357d0cde7c054b8.tar.gz barebox-96da2169915df634e113e444c357d0cde7c054b8.tar.xz | |
mci: production year for eMMC 4.41 and later
Year is coded in 4 bits of CID. eMMC 4.41
adds a new interpretation rule: production
year for 4.41 cards and newer is between 2010
and 2025 with 0 corresponding to 2013.
This fix was inspired by currect kernel code.
Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci/mci-core.c')
| -rw-r--r-- | drivers/mci/mci-core.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index 9bdcdbec6c..7161af10e6 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -717,7 +717,7 @@ static void mci_detect_version_from_csd(struct mci *mci) mci->version = MMC_VERSION_4; break; default: - printf("unknown card version, fallback to 1.2\n"); + printf("unknown card version, fallback to 1.02\n"); mci->version = MMC_VERSION_1_2; break; } @@ -1398,10 +1398,17 @@ static unsigned extract_mtd_month(struct mci *mci) */ static unsigned extract_mtd_year(struct mci *mci) { + unsigned year; if (IS_SD(mci)) - return UNSTUFF_BITS(mci->cid, 12, 8) + 2000; - else + year = UNSTUFF_BITS(mci->cid, 12, 8) + 2000; + else if (mci->version < MMC_VERSION_4_41) return UNSTUFF_BITS(mci->cid, 8, 4) + 1997; + else { + year = UNSTUFF_BITS(mci->cid, 8, 4) + 1997; + if (year < 2010) + year += 16; + } + return year; } static void mci_print_caps(unsigned caps) @@ -1448,7 +1455,7 @@ static void mci_info(struct device_d *dev) (mci->version >> 4) & 0xf, mci->version & 0xf); } else { printf(" Attached is an SD Card (Version: %u.%u)\n", - (mci->version >> 4) & 0xf, mci->version & 0xf); + (mci->version >> 8) & 0xf, mci->version & 0xff); } printf(" Capacity: %u MiB\n", (unsigned)(mci->capacity >> 20)); |