diff options
| author | Jassi Brar <jassisinghbrar@gmail.com> | 2010-09-07 04:02:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-11 22:58:48 +0100 |
| commit | 8b1f5d91e23300ea2f65007047d26799157dc4b8 (patch) | |
| tree | dcef842c0eaa7751e34188855d6515cd1899100f /arch/arm/common | |
| parent | e4eab08d6050ad04d960738f589724204fd1064c (diff) | |
| download | linux-8b1f5d91e23300ea2f65007047d26799157dc4b8.tar.gz linux-8b1f5d91e23300ea2f65007047d26799157dc4b8.tar.bz2 linux-8b1f5d91e23300ea2f65007047d26799157dc4b8.zip | |
ARM: 6367/1: PL330: Accept different revision
The driver can handle different revisions of the core
which vary only minorly.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/pl330.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/common/pl330.c b/arch/arm/common/pl330.c index 5ebbab6242a7..8f0f86db3602 100644 --- a/arch/arm/common/pl330.c +++ b/arch/arm/common/pl330.c @@ -146,8 +146,7 @@ #define DESIGNER 0x41 #define REVISION 0x0 #define INTEG_CFG 0x0 -#define PERIPH_ID_VAL ((PART << 0) | (DESIGNER << 12) \ - | (REVISION << 20) | (INTEG_CFG << 24)) +#define PERIPH_ID_VAL ((PART << 0) | (DESIGNER << 12)) #define PCELL_ID_VAL 0xb105f00d @@ -1859,10 +1858,10 @@ int pl330_add(struct pl330_info *pi) regs = pi->base; /* Check if we can handle this DMAC */ - if (get_id(pi, PERIPH_ID) != PERIPH_ID_VAL + if ((get_id(pi, PERIPH_ID) & 0xfffff) != PERIPH_ID_VAL || get_id(pi, PCELL_ID) != PCELL_ID_VAL) { dev_err(pi->dev, "PERIPH_ID 0x%x, PCELL_ID 0x%x !\n", - readl(regs + PERIPH_ID), readl(regs + PCELL_ID)); + get_id(pi, PERIPH_ID), get_id(pi, PCELL_ID)); return -EINVAL; } |