← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/mmc/core/bus.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mmc/core/bus.c
274
274
                break;
275
275
        case MMC_TYPE_SD:
276
276
                type = "SD";
277
 
                if (mmc_card_blockaddr(card))
278
 
                        type = "SDHC";
 
277
                if (mmc_card_blockaddr(card)) {
 
278
                        if (mmc_card_ext_capacity(card))
 
279
                                type = "SDXC";
 
280
                        else
 
281
                                type = "SDHC";
 
282
                }
279
283
                break;
280
284
        case MMC_TYPE_SDIO:
281
285
                type = "SDIO";
284
288
                type = "SD-combo";
285
289
                if (mmc_card_blockaddr(card))
286
290
                        type = "SDHC-combo";
 
291
                break;
287
292
        default:
288
293
                type = "?";
289
294
                break;
298
303
        } else {
299
304
                printk(KERN_INFO "%s: new %s%s%s card at address %04x\n",
300
305
                        mmc_hostname(card->host),
301
 
                        mmc_card_highspeed(card) ? "high speed " : "",
 
306
                        mmc_sd_card_uhs(card) ? "ultra high speed " :
 
307
                        (mmc_card_highspeed(card) ? "high speed " : ""),
302
308
                        mmc_card_ddr_mode(card) ? "DDR " : "",
303
309
                        type, card->rca);
304
310
        }