diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-18 11:37:14 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-18 11:37:14 +0100 |
| commit | 6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f (patch) | |
| tree | 1ba41dcec5d5a3a7fff8643d5d28fe24bfc50798 /arch/powerpc/include/asm/reg.h | |
| parent | powerpc/64: Implement clear_bit_unlock_is_negative_byte() (diff) | |
| parent | powerpc/8xx: Perf events on PPC 8xx (diff) | |
| download | linux-6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f.tar.xz linux-6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx breakpoints and perf, t1042rdb display support,
and board updates."
Diffstat (limited to 'arch/powerpc/include/asm/reg.h')
| -rw-r--r-- | arch/powerpc/include/asm/reg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index 0d8827966115..9c4689401298 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -552,7 +552,9 @@ #define SPRN_IBAT7U 0x236 /* Instruction BAT 7 Upper Register */ #define SPRN_ICMP 0x3D5 /* Instruction TLB Compare Register */ #define SPRN_ICTC 0x3FB /* Instruction Cache Throttling Control Reg */ +#ifndef SPRN_ICTRL #define SPRN_ICTRL 0x3F3 /* 1011 7450 icache and interrupt ctrl */ +#endif #define ICTRL_EICE 0x08000000 /* enable icache parity errs */ #define ICTRL_EDC 0x04000000 /* enable dcache parity errs */ #define ICTRL_EICP 0x00000100 /* enable icache par. check */ |