diff options
Diffstat (limited to 'arch/arm/common/pl330.c')
-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 @@ | |||
146 | #define DESIGNER 0x41 | 146 | #define DESIGNER 0x41 |
147 | #define REVISION 0x0 | 147 | #define REVISION 0x0 |
148 | #define INTEG_CFG 0x0 | 148 | #define INTEG_CFG 0x0 |
149 | #define PERIPH_ID_VAL ((PART << 0) | (DESIGNER << 12) \ | 149 | #define PERIPH_ID_VAL ((PART << 0) | (DESIGNER << 12)) |
150 | | (REVISION << 20) | (INTEG_CFG << 24)) | ||
151 | 150 | ||
152 | #define PCELL_ID_VAL 0xb105f00d | 151 | #define PCELL_ID_VAL 0xb105f00d |
153 | 152 | ||
@@ -1859,10 +1858,10 @@ int pl330_add(struct pl330_info *pi) | |||
1859 | regs = pi->base; | 1858 | regs = pi->base; |
1860 | 1859 | ||
1861 | /* Check if we can handle this DMAC */ | 1860 | /* Check if we can handle this DMAC */ |
1862 | if (get_id(pi, PERIPH_ID) != PERIPH_ID_VAL | 1861 | if ((get_id(pi, PERIPH_ID) & 0xfffff) != PERIPH_ID_VAL |
1863 | || get_id(pi, PCELL_ID) != PCELL_ID_VAL) { | 1862 | || get_id(pi, PCELL_ID) != PCELL_ID_VAL) { |
1864 | dev_err(pi->dev, "PERIPH_ID 0x%x, PCELL_ID 0x%x !\n", | 1863 | dev_err(pi->dev, "PERIPH_ID 0x%x, PCELL_ID 0x%x !\n", |
1865 | readl(regs + PERIPH_ID), readl(regs + PCELL_ID)); | 1864 | get_id(pi, PERIPH_ID), get_id(pi, PCELL_ID)); |
1866 | return -EINVAL; | 1865 | return -EINVAL; |
1867 | } | 1866 | } |
1868 | 1867 | ||