diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-09 15:13:56 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-09 15:13:56 +0100 |
| commit | 012b7d339ce8c42d41e35b35c4acc3dd29501d52 (patch) | |
| tree | 82eb9a984d741dffdca64e8a51be3473b8723b50 | |
| parent | eb7fffa39a3f114832df54a3e373d7580d8fe757 (diff) | |
| download | op-kernel-dev-012b7d339ce8c42d41e35b35c4acc3dd29501d52.zip op-kernel-dev-012b7d339ce8c42d41e35b35c4acc3dd29501d52.tar.gz | |
MMC: MMCI: use AMBA bus accessors
Rather than open coding the accessors for decoding peripheral IDs,
use the macros already provided.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
| -rw-r--r-- | drivers/mmc/host/mmci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index e1aa847..ac43f39 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -515,12 +515,12 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) host = mmc_priv(mmc); host->mmc = mmc; - /* Bits 12 thru 19 is the designer */ - host->hw_designer = (dev->periphid >> 12) & 0xff; - /* Bits 20 thru 23 is the revison */ - host->hw_revision = (dev->periphid >> 20) & 0xf; + + host->hw_designer = amba_manf(dev); + host->hw_revision = amba_rev(dev); DBG(host, "designer ID = 0x%02x\n", host->hw_designer); DBG(host, "revision = 0x%01x\n", host->hw_revision); + host->clk = clk_get(&dev->dev, NULL); if (IS_ERR(host->clk)) { ret = PTR_ERR(host->clk); |
