ARM: 7397/1: l2x0: only apply workaround for erratum #753970 on PL310
authorWill Deacon <will.deacon@arm.com>
Mon, 14 May 2012 12:38:00 +0000 (17:38 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Mon, 14 May 2012 12:38:00 +0000 (17:38 +0530)
commiteae347b84da224215042f73056d630524af6f8da
tree8b4fc2a463669f933fac83f7a9af6b16c41567c2
parent89e6892482edf487eba88dfb58d8dffcf854aeff
ARM: 7397/1: l2x0: only apply workaround for erratum #753970 on PL310

The workaround for PL310 erratum #753970 can lead to deadlock on systems
with an L220 cache controller.

This patch makes the workaround effective only when the cache controller
is identified as a PL310 at probe time.

Cc: stable@vger.kernel.org
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Conflicts:

arch/arm/mm/cache-l2x0.c

Change-Id: Ib6ed0c153df889550c48d147216105aaa38dde56
arch/arm/mm/cache-l2x0.c