Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228895
b: refs/heads/master
c: e8120ad
h: refs/heads/master
i:
  228893: 808170d
  228891: 8c9fde3
  228887: c532b5a
  228879: e1a99eb
  228863: 40b4166
v: v3
  • Loading branch information
Philip Rakity authored and Chris Ball committed Jan 9, 2011
1 parent dd7b654 commit 0a639cd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 04566831a703ae3ef4b49a2deae261c9ed26e020
refs/heads/master: e8120ad129c160ff5b2e2b197d025a2cd661c2f2
5 changes: 4 additions & 1 deletion trunk/drivers/mmc/host/sdhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mmc/host/sdhci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 0a639cd

Please sign in to comment.