summaryrefslogtreecommitdiffstats
path: root/drivers/amba
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-09-07 22:43:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-08 10:02:27 +0100
commit01723a9566f9e9ce4c75e5c4c9f6dc20600871a7 (patch)
treeee80f7c5d7e9b8b02e9b6b882921ea0132d8cb92 /drivers/amba
parent2da6d64a638eb982bebf34e2999f0b67cfb90f33 (diff)
downloadlinux-stable-01723a9566f9e9ce4c75e5c4c9f6dc20600871a7.tar.gz
linux-stable-01723a9566f9e9ce4c75e5c4c9f6dc20600871a7.tar.bz2
linux-stable-01723a9566f9e9ce4c75e5c4c9f6dc20600871a7.zip
ARM: 6368/1: move the PrimeCell IDs to use macros
This make four macros for the PrimeCell ID register available to drivers that use them witout using the PrimeCell/AMBA bus abstraction and struct amba_device. It also moves the magic PrimeCell CID "B105F00D" to the bus.h header file. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/amba')
-rw-r--r--drivers/amba/bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index d31590e7011b..2737b9752205 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -298,7 +298,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
amba_put_disable_pclk(dev);
- if (cid == 0xb105f00d)
+ if (cid == AMBA_CID)
dev->periphid = pid;
if (!dev->periphid)