[backfire] merge r27449
[openwrt-10.03/.git] / target / linux / ifxmips / files / arch / mips / ifxmips / setup.c
index 8aac788d74f0a184fd1ea8c91fa9d029ceb29109..06fa2f0b4bc63220a2ae0e38726e72d121a4da92 100644 (file)
@@ -1,6 +1,4 @@
 /*
- *   arch/mips/ifxmips/setup.c
- *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
- *   Copyright (C) 2004 peng.liu@infineon.com 
- *
- *   Rewrite of Infineon IFXMips code, thanks to infineon for the support,
- *   software and hardware
- *
- *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
- *
+ *   Copyright (C) 2004 peng.liu@infineon.com
+ *   Copyright (C) 2007 John Crispin <blogic@openwrt.org>
  */
 
 #include <linux/init.h>
+#include <linux/cpu.h>
 
 #include <asm/time.h>
 #include <asm/traps.h>
-#include <asm/cpu.h>
 #include <asm/irq.h>
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_irq.h>
-#include <asm/ifxmips/ifxmips_pmu.h>
+#include <asm/bootinfo.h>
 
-static unsigned int r4k_offset; /* Amount to increment compare reg each time */
-static unsigned int r4k_cur;    /* What counter should be at next timer irq */
+#include <ifxmips.h>
+#include <ifxmips_irq.h>
+#include <ifxmips_pmu.h>
+#include <ifxmips_cgu.h>
+#include <ifxmips_prom.h>
 
-extern void ifxmips_reboot_setup (void);
-void prom_printf (const char * fmt, ...);
+static unsigned int r4k_offset;
+static unsigned int r4k_cur;
 
-void
-__init bus_error_init (void)
-{
-               /* nothing yet */
-}
+/* required in arch/mips/kernel/kspd.c */
+unsigned long cpu_khz;
 
-unsigned int
-ifxmips_get_ddr_hz (void)
-{
-       switch (readl(IFXMIPS_CGU_SYS) & 0x3)
-       {
-       case 0:
-               return CLOCK_167M;
-       case 1:
-               return CLOCK_133M;
-       case 2:
-               return CLOCK_111M;
-       }
-       return CLOCK_83M;
-}
-EXPORT_SYMBOL(ifxmips_get_ddr_hz);
+extern void ifxmips_reboot_setup(void);
 
-unsigned int
-ifxmips_get_cpu_hz (void)
+unsigned int ifxmips_get_cpu_ver(void)
 {
-       unsigned int ddr_clock = ifxmips_get_ddr_hz();
-       switch (readl(IFXMIPS_CGU_SYS) & 0xc)
-       {
-       case 0:
-               return CLOCK_333M;
-       case 4:
-               return ddr_clock;
-       }
-       return ddr_clock << 1;
-}
-EXPORT_SYMBOL(ifxmips_get_cpu_hz);
-
-unsigned int
-ifxmips_get_fpi_hz (void)
-{
-       unsigned int ddr_clock = ifxmips_get_ddr_hz();
-       if (readl(IFXMIPS_CGU_SYS) & 0x40)
-       {
-               return ddr_clock >> 1;
-       }
-       return ddr_clock;
-}
-EXPORT_SYMBOL(ifxmips_get_fpi_hz);
-
-unsigned int
-ifxmips_get_cpu_ver (void)
-{
-       return readl(IFXMIPS_MCD_CHIPID) & 0xFFFFF000;
+       return (ifxmips_r32(IFXMIPS_MPS_CHIPID) & 0xF0000000) >> 28;
 }
 EXPORT_SYMBOL(ifxmips_get_cpu_ver);
 
-void
-ifxmips_time_init (void)
+static inline u32 ifxmips_get_counter_resolution(void)
 {
-       mips_hpt_frequency = ifxmips_get_cpu_hz() / 2;
-       r4k_offset = mips_hpt_frequency / HZ;
-       printk("mips_hpt_frequency:%d\n", mips_hpt_frequency);
-       printk("r4k_offset: %08x(%d)\n", r4k_offset, r4k_offset);
+       u32 res;
+       __asm__ __volatile__(
+               ".set   push\n"
+               ".set   mips32r2\n"
+               ".set   noreorder\n"
+               "rdhwr  %0, $3\n"
+               "ehb\n"
+               ".set pop\n"
+               : "=&r" (res)
+               : /* no input */
+               : "memory");
+       instruction_hazard();
+       return res;
 }
 
-int
-ifxmips_be_handler(struct pt_regs *regs, int is_fixup)
+void __init plat_time_init(void)
 {
-       /*TODO*/
-       printk(KERN_ERR "TODO: BUS error\n");
-
-       return MIPS_BE_FATAL;
-}
-
-/* ISR GPTU Timer 6 for high resolution timer */
-static irqreturn_t
-ifxmips_timer6_interrupt(int irq, void *dev_id)
-{
-       timer_interrupt(IFXMIPS_TIMER6_INT, NULL);
-
-       return IRQ_HANDLED;
-}
-
-static struct irqaction hrt_irqaction = {
-       .handler = ifxmips_timer6_interrupt,
-       .flags = IRQF_DISABLED,
-       .name = "hrt",
-};
-
-void __init
-plat_timer_setup (struct irqaction *irq)
-{
-       unsigned int retval;
-
-       setup_irq(MIPS_CPU_TIMER_IRQ, irq);
-
+       mips_hpt_frequency = ifxmips_get_cpu_hz() / ifxmips_get_counter_resolution();
        r4k_cur = (read_c0_count() + r4k_offset);
        write_c0_compare(r4k_cur);
 
        ifxmips_pmu_enable(IFXMIPS_PMU_PWDCR_GPT | IFXMIPS_PMU_PWDCR_FPI);
-
-       writel(0x100, IFXMIPS_GPTU_GPT_CLC);
-
-       writel(0xffff, IFXMIPS_GPTU_GPT_CAPREL);
-       writel(0x80C0, IFXMIPS_GPTU_GPT_T6CON);
-
-       retval = setup_irq(IFXMIPS_TIMER6_INT, &hrt_irqaction);
-
-       if (retval)
-       {
-               prom_printf("reqeust_irq failed %d. HIGH_RES_TIMER is diabled\n", IFXMIPS_TIMER6_INT);
-       }
+       ifxmips_w32(0x100, IFXMIPS_GPTU_GPT_CLC); /* set clock divider to 1 */
+       cpu_khz = ifxmips_get_cpu_hz();
 }
 
-void __init
-plat_mem_setup (void)
+void __init plat_mem_setup(void)
 {
        u32 status;
-       prom_printf("This %s has a cpu rev of 0x%X\n", BOARD_SYSTEM_TYPE, ifxmips_get_cpu_ver());
+       prom_printf("This %s system has a cpu rev of %d\n", get_system_type(), ifxmips_get_cpu_ver());
 
-       //TODO WHY ???
-       /* clear RE bit*/
+       /* make sure to have no "reverse endian" for user mode! */
        status = read_c0_status();
        status &= (~(1<<25));
        write_c0_status(status);
 
        ifxmips_reboot_setup();
-       board_time_init = ifxmips_time_init;
-       board_be_handler = &ifxmips_be_handler;
 
        ioport_resource.start = IOPORT_RESOURCE_START;
        ioport_resource.end = IOPORT_RESOURCE_END;