diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-24 08:12:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-24 08:12:24 -0800 |
| commit | 3836414f45b01486b9b50c627a329010573ad0f4 (patch) | |
| tree | f41e51a6194491a63dc6f86473f335a07e031488 /arch | |
| parent | 60fd8e35e32087eed200bea99be037b5f75a016e (diff) | |
| parent | 52666298aebe5e9ab28a773ee61d2ce81fa097bb (diff) | |
| download | linux-3.10-3836414f45b01486b9b50c627a329010573ad0f4.tar.gz linux-3.10-3836414f45b01486b9b50c627a329010573ad0f4.tar.bz2 linux-3.10-3836414f45b01486b9b50c627a329010573ad0f4.zip | |
Merge branch 'vexpress/fixes' of git://git.linaro.org/people/pawelmoll/linux into fixes
From Pawel Moll:
- makes the V2P-CA15_A7 (a.k.a. TC2) work with 3.8 kernels
- improves vexpress-sysreg.c behaviour on arm64 platforms
* 'vexpress/fixes' of git://git.linaro.org/people/pawelmoll/linux:
mfd: vexpress-sysreg: Don't skip initialization on probe
ARM: vexpress: Enable A7 cores in V2P-CA15_A7's Device Tree
ARM: vexpress: extend the MPIDR range used for pen release check
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 2 | ||||
| -rw-r--r-- | arch/arm/plat-versatile/headsmp.S | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index 1fc405a9ecf..cf8071ad22d 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts @@ -45,7 +45,6 @@ reg = <1>; }; -/* A7s disabled till big.LITTLE patches are available... cpu2: cpu@2 { device_type = "cpu"; compatible = "arm,cortex-a7"; @@ -63,7 +62,6 @@ compatible = "arm,cortex-a7"; reg = <0x102>; }; -*/ }; memory@80000000 { diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S index dd703ef09b8..b178d44e9ea 100644 --- a/arch/arm/plat-versatile/headsmp.S +++ b/arch/arm/plat-versatile/headsmp.S @@ -20,7 +20,7 @@ */ ENTRY(versatile_secondary_startup) mrc p15, 0, r0, c0, c0, 5 - and r0, r0, #15 + bic r0, #0xff000000 adr r4, 1f ldmia r4, {r5, r6} sub r4, r4, r5 |