sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

amba: introduce amba_device_get_pid/cid 

so we can use it on vexpress to detect the hardware mapping

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2013-02-12 14:03:25 +01:00 committed by Sascha Hauer
parent 2738f72352
commit a59a5acf68
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/amba/bus.c
View File

@ -104,7 +104,7 @@ int amba_device_add(struct amba_device *dev)
{
u32 size;
void __iomem *tmp;
int i, ret;
int ret;
struct resource *res = NULL;
dev->dev.bus = &amba_bustype;
@ -135,12 +135,8 @@ int amba_device_add(struct amba_device *dev)
* Read pid and cid based on size of resource
* they are located at end of region
*/
for (pid = 0, i = 0; i < 4; i++)
pid |= (readl(tmp + size - 0x20 + 4 * i) & 255) <<
(i * 8);
for (cid = 0, i = 0; i < 4; i++)
cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) <<
(i * 8);
pid = amba_device_get_pid(tmp, size);
cid = amba_device_get_cid(tmp, size);
if (cid == AMBA_CID)
dev->periphid = pid;

28
include/linux/amba/bus.h
View File

@ -150,4 +150,32 @@ struct amba_device name##_device = { \
.periphid = id, \
}
#include <io.h>
/*
* Read pid and cid based on size of resource
* they are located at end of region
*/
static inline u32 amba_device_get_pid(void *base, u32 size)
{
int i;
u32 pid;
for (pid = 0, i = 0; i < 4; i++)
pid |= (readl(base + size - 0x20 + 4 * i) & 255) <<
(i * 8);
return pid;
}
static inline u32 amba_device_get_cid(void *base, u32 size)
{
int i;
u32 cid;
for (cid = 0, i = 0; i < 4; i++)
cid |= (readl(base + size - 0x10 + 4 * i) & 255) <<
(i * 8);
return cid;
}
#endif