From 0a639cd59134c82f093392fd4bd7fe070bf61763 Mon Sep 17 00:00:00 2001 From: Philip Rakity Date: Tue, 30 Nov 2010 00:55:23 -0500 Subject: [PATCH] --- yaml --- r: 228895 b: refs/heads/master c: e8120ad129c160ff5b2e2b197d025a2cd661c2f2 h: refs/heads/master i: 228893: 808170db0c3dc3bad5d2375dd25d7506123fcba2 228891: 8c9fde38bc84ea64182461f9a5c98ccbb68a519e 228887: c532b5a4b231577461212112bf99de21eb665fe2 228879: e1a99eb5975b0451ba1f0d036db8f867518ac2a5 228863: 40b41663b11443c2202cf53648e27f649b346462 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 5 ++++- trunk/drivers/mmc/host/sdhci.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb4a270ad581..b50d3a64e81f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04566831a703ae3ef4b49a2deae261c9ed26e020 +refs/heads/master: e8120ad129c160ff5b2e2b197d025a2cd661c2f2 diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index a25db426c910..8a74fcbfe13b 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -77,8 +77,11 @@ static void sdhci_dumpregs(struct sdhci_host *host) printk(KERN_DEBUG DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", sdhci_readw(host, SDHCI_ACMD12_ERR), sdhci_readw(host, SDHCI_SLOT_INT_STATUS)); - printk(KERN_DEBUG DRIVER_NAME ": Caps: 0x%08x | Max curr: 0x%08x\n", + printk(KERN_DEBUG DRIVER_NAME ": Caps: 0x%08x | Caps_1: 0x%08x\n", sdhci_readl(host, SDHCI_CAPABILITIES), + sdhci_readl(host, SDHCI_CAPABILITIES_1)); + printk(KERN_DEBUG DRIVER_NAME ": Cmd: 0x%08x | Max curr: 0x%08x\n", + sdhci_readw(host, SDHCI_COMMAND), sdhci_readl(host, SDHCI_MAX_CURRENT)); if (host->flags & SDHCI_USE_ADMA) diff --git a/trunk/drivers/mmc/host/sdhci.h b/trunk/drivers/mmc/host/sdhci.h index e42d7f00c060..1efe7dc5255b 100644 --- a/trunk/drivers/mmc/host/sdhci.h +++ b/trunk/drivers/mmc/host/sdhci.h @@ -165,7 +165,7 @@ #define SDHCI_CAN_VDD_180 0x04000000 #define SDHCI_CAN_64BIT 0x10000000 -/* 44-47 reserved for more caps */ +#define SDHCI_CAPABILITIES_1 0x44 #define SDHCI_MAX_CURRENT 0x48