Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jassi Brar and committed by
Russell King
8b1f5d91 e4eab08d

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