Merge branch 'core/xen' into x86/xen

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 1bc57d0f4c5c..fe6bee09cece 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -53,6 +53,7 @@ txx9_reg_res_init(unsigned int pcode, unsigned long base, unsigned long size)
                 txx9_ce_res[i].name = txx9_ce_res_name[i];
         }
 
+        txx9_pcode = pcode;
         sprintf(txx9_pcode_str, "TX%x", pcode);
         if (base) {
                 txx9_reg_res.start = base & 0xfffffffffULL;
@@ -328,6 +329,9 @@ void __init arch_init_irq(void)
 
 void __init plat_time_init(void)
 {
+#ifdef CONFIG_CPU_TX49XX
+        mips_hpt_frequency = txx9_cpu_clock / 2;
+#endif
         txx9_board_vec->time_init();
 }