diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-21 11:00:44 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-21 11:00:44 +1100 |
| commit | 50f4df4e6a7ae111fd9b8fada4155675a4410e99 (patch) | |
| tree | a174a42f1f38660d0c4d3c4e81e5bb1e14fab0d1 /arch/powerpc/kernel | |
| parent | 12fcdba1b7ae8b25696433f420b775aeb556d89b (diff) | |
| parent | b49d81ded47e9d01f7128fce50d224ccc2150960 (diff) | |
| download | talos-op-linux-50f4df4e6a7ae111fd9b8fada4155675a4410e99.tar.gz talos-op-linux-50f4df4e6a7ae111fd9b8fada4155675a4410e99.zip | |
Merge remote branch 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S index 894e64fa481e..5c518ad3445c 100644 --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S @@ -64,6 +64,12 @@ _GLOBAL(__setup_cpu_e500v2) bl __e500_icache_setup bl __e500_dcache_setup bl __setup_e500_ivors +#ifdef CONFIG_RAPIDIO + /* Ensure that RFXE is set */ + mfspr r3,SPRN_HID1 + oris r3,r3,HID1_RFXE@h + mtspr SPRN_HID1,r3 +#endif mtlr r4 blr _GLOBAL(__setup_cpu_e500mc) |
