ar71xx: update mips multi-machine stuff
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / setup.c
index 758f5414235e1d71b24c5fda7f10f509f746a7e3..f23592223aef68045fc1aa06cddc3955a7ef04bc 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx SoC specific setup
  *
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Parts of this file are based on Atheros' 2.6.15 BSP
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
-#include <linux/types.h>
-#include <linux/pci.h>
 #include <linux/serial_8250.h>
 #include <linux/bootmem.h>
 
 #include <asm/bootinfo.h>
-#include <asm/traps.h>
 #include <asm/time.h>          /* for mips_hpt_frequency */
 #include <asm/reboot.h>                /* for _machine_{restart,halt} */
+#include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "machtype.h"
+#include "devices.h"
 
 #define AR71XX_SYS_TYPE_LEN    64
 #define AR71XX_BASE_FREQ       40000000
 #define AR91XX_BASE_FREQ       5000000
-
-#define AR71XX_MEM_SIZE_MIN    0x0200000
-#define AR71XX_MEM_SIZE_MAX    0x8000000
+#define AR724X_BASE_FREQ       5000000
 
 u32 ar71xx_cpu_freq;
 EXPORT_SYMBOL_GPL(ar71xx_cpu_freq);
@@ -47,11 +44,6 @@ EXPORT_SYMBOL_GPL(ar71xx_ddr_freq);
 enum ar71xx_soc_type ar71xx_soc;
 EXPORT_SYMBOL_GPL(ar71xx_soc);
 
-int (*ar71xx_pci_bios_init)(unsigned nr_irqs,
-                            struct ar71xx_pci_irq *map) __initdata;
-
-int (*ar71xx_pci_be_handler)(int is_fixup);
-
 static char ar71xx_sys_type[AR71XX_SYS_TYPE_LEN];
 
 static void ar71xx_restart(char *command)
@@ -68,24 +60,6 @@ static void ar71xx_halt(void)
                cpu_wait();
 }
 
-static int ar71xx_be_handler(struct pt_regs *regs, int is_fixup)
-{
-       int err = 0;
-
-       if (ar71xx_pci_be_handler)
-               err = ar71xx_pci_be_handler(is_fixup);
-
-       return (is_fixup && !err) ? MIPS_BE_FIXUP : MIPS_BE_FATAL;
-}
-
-int __init ar71xx_pci_init(unsigned nr_irqs, struct ar71xx_pci_irq *map)
-{
-       if (!ar71xx_pci_bios_init)
-               return 0;
-
-       return ar71xx_pci_bios_init(nr_irqs, map);
-}
-
 static void __init ar71xx_detect_mem_size(void)
 {
        unsigned long size;
@@ -102,45 +76,66 @@ static void __init ar71xx_detect_mem_size(void)
 
 static void __init ar71xx_detect_sys_type(void)
 {
-       char *chip;
+       char *chip = "????";
        u32 id;
-       u32 rev;
-
-       id = ar71xx_reset_rr(RESET_REG_REV_ID) & REV_ID_MASK;
-       rev = (id >> REV_ID_REVISION_SHIFT) & REV_ID_REVISION_MASK;
+       u32 major;
+       u32 minor;
+       u32 rev = 0;
+
+       id = ar71xx_reset_rr(AR71XX_RESET_REG_REV_ID);
+       major = id & REV_ID_MAJOR_MASK;
+
+       switch (major) {
+       case REV_ID_MAJOR_AR71XX:
+               minor = id & AR71XX_REV_ID_MINOR_MASK;
+               rev = id >> AR71XX_REV_ID_REVISION_SHIFT;
+               rev &= AR71XX_REV_ID_REVISION_MASK;
+               switch (minor) {
+               case AR71XX_REV_ID_MINOR_AR7130:
+                       ar71xx_soc = AR71XX_SOC_AR7130;
+                       chip = "7130";
+                       break;
 
-       switch (id & REV_ID_CHIP_MASK) {
-       case REV_ID_CHIP_AR7130:
-               ar71xx_soc = AR71XX_SOC_AR7130;
-               chip = "7130";
-               break;
+               case AR71XX_REV_ID_MINOR_AR7141:
+                       ar71xx_soc = AR71XX_SOC_AR7141;
+                       chip = "7141";
+                       break;
 
-       case REV_ID_CHIP_AR7141:
-               ar71xx_soc = AR71XX_SOC_AR7141;
-               chip = "7141";
+               case AR71XX_REV_ID_MINOR_AR7161:
+                       ar71xx_soc = AR71XX_SOC_AR7161;
+                       chip = "7161";
+                       break;
+               }
                break;
 
-       case REV_ID_CHIP_AR7161:
-               ar71xx_soc = AR71XX_SOC_AR7161;
-               chip = "7161";
+       case REV_ID_MAJOR_AR724X:
+               ar71xx_soc = AR71XX_SOC_AR7240;
+               chip = "7240";
+               rev = (id & AR724X_REV_ID_REVISION_MASK);
                break;
 
-       case REV_ID_CHIP_AR9130:
-               ar71xx_soc = AR71XX_SOC_AR9130;
-               chip = "9130";
-               break;
+       case REV_ID_MAJOR_AR913X:
+               minor = id & AR91XX_REV_ID_MINOR_MASK;
+               rev = id >> AR91XX_REV_ID_REVISION_SHIFT;
+               rev &= AR91XX_REV_ID_REVISION_MASK;
+               switch (minor) {
+               case AR91XX_REV_ID_MINOR_AR9130:
+                       ar71xx_soc = AR71XX_SOC_AR9130;
+                       chip = "9130";
+                       break;
 
-       case REV_ID_CHIP_AR9132:
-               ar71xx_soc = AR71XX_SOC_AR9132;
-               chip = "9132";
+               case AR91XX_REV_ID_MINOR_AR9132:
+                       ar71xx_soc = AR71XX_SOC_AR9132;
+                       chip = "9132";
+                       break;
+               }
                break;
 
        default:
-               panic("ar71xx: unknown chip id:0x%02x\n", id);
+               panic("ar71xx: unknown chip id:0x%08x\n", id);
        }
 
-       sprintf(ar71xx_sys_type, "Atheros AR%s rev %u (id:0x%02x)",
-               chip, rev, id);
+       sprintf(ar71xx_sys_type, "Atheros AR%s rev %u", chip, rev);
 }
 
 static void __init ar91xx_detect_sys_frequency(void)
@@ -149,7 +144,7 @@ static void __init ar91xx_detect_sys_frequency(void)
        u32 freq;
        u32 div;
 
-       pll = ar71xx_pll_rr(PLL_REG_CPU_PLL_CFG);
+       pll = ar71xx_pll_rr(AR91XX_PLL_REG_CPU_CONFIG);
 
        div = ((pll >> AR91XX_PLL_DIV_SHIFT) & AR91XX_PLL_DIV_MASK);
        freq = div * AR91XX_BASE_FREQ;
@@ -169,7 +164,7 @@ static void __init ar71xx_detect_sys_frequency(void)
        u32 freq;
        u32 div;
 
-       pll = ar71xx_pll_rr(PLL_REG_CPU_PLL_CFG);
+       pll = ar71xx_pll_rr(AR71XX_PLL_REG_CPU_CONFIG);
 
        div = ((pll >> AR71XX_PLL_DIV_SHIFT) & AR71XX_PLL_DIV_MASK) + 1;
        freq = div * AR71XX_BASE_FREQ;
@@ -184,6 +179,29 @@ static void __init ar71xx_detect_sys_frequency(void)
        ar71xx_ahb_freq = ar71xx_cpu_freq / div;
 }
 
+static void __init ar724x_detect_sys_frequency(void)
+{
+       u32 pll;
+       u32 freq;
+       u32 div;
+
+       pll = ar71xx_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
+
+       div = ((pll >> AR724X_PLL_DIV_SHIFT) & AR724X_PLL_DIV_MASK);
+       freq = div * AR724X_BASE_FREQ;
+
+       div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK);
+       freq *= div;
+
+       ar71xx_cpu_freq = freq;
+
+       div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
+       ar71xx_ddr_freq = freq / div;
+
+       div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
+       ar71xx_ahb_freq = ar71xx_cpu_freq / div;
+}
+
 static void __init detect_sys_frequency(void)
 {
        switch (ar71xx_soc) {
@@ -193,6 +211,10 @@ static void __init detect_sys_frequency(void)
                ar71xx_detect_sys_frequency();
                break;
 
+       case AR71XX_SOC_AR7240:
+               ar724x_detect_sys_frequency();
+               break;
+
        case AR71XX_SOC_AR9130:
        case AR71XX_SOC_AR9132:
                ar91xx_detect_sys_frequency();
@@ -203,26 +225,6 @@ static void __init detect_sys_frequency(void)
        }
 }
 
-#ifdef CONFIG_AR71XX_EARLY_SERIAL
-static void __init ar71xx_early_serial_setup(void)
-{
-       struct uart_port p;
-
-       memset(&p, 0, sizeof(p));
-
-       p.flags         = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP;
-       p.iotype        = UPIO_MEM32;
-       p.uartclk       = ar71xx_ahb_freq;
-       p.irq           = AR71XX_MISC_IRQ_UART;
-       p.regshift      = 2;
-       p.mapbase       = AR71XX_UART_BASE;
-
-       early_serial_setup(&p);
-}
-#else
-static inline void ar71xx_early_serial_setup(void) {};
-#endif /* CONFIG_AR71XX_EARLY_SERIAL */
-
 const char *get_system_type(void)
 {
        return ar71xx_sys_type;
@@ -255,16 +257,34 @@ void __init plat_mem_setup(void)
        ar71xx_detect_sys_type();
        detect_sys_frequency();
 
+       printk(KERN_INFO
+               "%s, CPU:%u.%03u MHz, AHB:%u.%03u MHz, DDR:%u.%03u MHz\n",
+               ar71xx_sys_type,
+               ar71xx_cpu_freq / 1000000, (ar71xx_cpu_freq / 1000) % 1000,
+               ar71xx_ahb_freq / 1000000, (ar71xx_ahb_freq / 1000) % 1000,
+               ar71xx_ddr_freq / 1000000, (ar71xx_ddr_freq / 1000) % 1000);
+
        _machine_restart = ar71xx_restart;
        _machine_halt = ar71xx_halt;
        pm_power_off = ar71xx_halt;
-
-       board_be_handler = ar71xx_be_handler;
-
-       ar71xx_early_serial_setup();
 }
 
 void __init plat_time_init(void)
 {
        mips_hpt_frequency = ar71xx_cpu_freq / 2;
 }
+
+__setup("board=", mips_machtype_setup);
+
+static int __init ar71xx_machine_setup(void)
+{
+       ar71xx_gpio_init();
+
+       ar71xx_add_device_uart();
+       ar71xx_add_device_wdt();
+
+       mips_machine_setup();
+       return 0;
+}
+
+arch_initcall(ar71xx_machine_setup);