ar71xx: add preliminary support for the RB-411U (thanks to Feher Zoltan for testing)

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / prom.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index 5402e0a..24373cd 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -12,18 +12,18 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/serial_reg.h>
 
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 #include <asm/fw/myloader/myloader.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 struct board_rec {
-       char            *name;
-       unsigned long   mach_type;
+       char                    *name;
+       enum ar71xx_mach_type   mach_type;
 };
 
 static int ar71xx_prom_argc __initdata;
@@ -35,36 +35,72 @@ static struct board_rec boards[] __initdata = {
                .name           = "411",
                .mach_type      = AR71XX_MACH_RB_411,
        }, {
+               .name           = "411U",
+               .mach_type      = AR71XX_MACH_RB_411U,
+       }, {
                .name           = "433",
                .mach_type      = AR71XX_MACH_RB_433,
        }, {
+               .name           = "433U",
+               .mach_type      = AR71XX_MACH_RB_433U,
+       }, {
                .name           = "450",
                .mach_type      = AR71XX_MACH_RB_450,
        }, {
+               .name           = "450G",
+               .mach_type      = AR71XX_MACH_RB_450G,
+       }, {
                .name           = "493",
                .mach_type      = AR71XX_MACH_RB_493,
        }, {
-               .name           = "AW-NR580",
-               .mach_type      = AR71XX_MACH_AW_NR580,
+               .name           = "AP81",
+               .mach_type      = AR71XX_MACH_AP81,
        }, {
                .name           = "AP83",
                .mach_type      = AR71XX_MACH_AP83,
        }, {
+               .name           = "AW-NR580",
+               .mach_type      = AR71XX_MACH_AW_NR580,
+       }, {
                .name           = "TEW-632BRP",
                .mach_type      = AR71XX_MACH_TEW_632BRP,
        }, {
+               .name           = "TL-WR741ND",
+               .mach_type      = AR71XX_MACH_TL_WR741ND,
+       }, {
+               .name           = "TL-WR941ND",
+               .mach_type      = AR71XX_MACH_TL_WR941ND,
+       }, {
                .name           = "UBNT-RS",
                .mach_type      = AR71XX_MACH_UBNT_RS,
        }, {
+               .name           = "UBNT-RSPRO",
+               .mach_type      = AR71XX_MACH_UBNT_RSPRO,
+       }, {
+               .name           = "Ubiquiti AR71xx-based board",
+               .mach_type      = AR71XX_MACH_UBNT_RS,
+       }, {
+               .name           = "UBNT-LS-SR71",
+               .mach_type      = AR71XX_MACH_UBNT_LSSR71,
+       }, {
                .name           = "UBNT-LSX",
                .mach_type      = AR71XX_MACH_UBNT_LSX,
        }, {
                .name           = "WNR2000",
                .mach_type      = AR71XX_MACH_WNR2000,
        }, {
+               .name           = "WRT160NL",
+               .mach_type      = AR71XX_MACH_WRT160NL,
+       }, {
+               .name           = "WRT400N",
+               .mach_type      = AR71XX_MACH_WRT400N,
+       }, {
                .name           = "PB42",
                .mach_type      = AR71XX_MACH_PB42,
        }, {
+               .name           = "PB44",
+               .mach_type      = AR71XX_MACH_PB44,
+       }, {
                .name           = "MZK-W300NH",
                .mach_type      = AR71XX_MACH_MZK_W300NH,
        }, {
@@ -115,10 +151,16 @@ static __init char *ar71xx_prom_getenv(const char *envname)
        if (!is_valid_ram_addr(ar71xx_prom_envp))
                return NULL;
 
-       for (env = ar71xx_prom_envp; is_valid_ram_addr(*env); env++)
+       for (env = ar71xx_prom_envp; is_valid_ram_addr(*env); env++) {
                if (strncmp(envname, *env, len) == 0 && (*env)[len] == '=')
                        return *env + len + 1;
 
+               /* RedBoot env comes in pointer pairs - key, value */
+               if (strncmp(envname, *env, len) == 0 && (*env)[len] == 0)
+                       if (is_valid_ram_addr(*(++env)))
+                               return *env;
+       }
+
        return NULL;
 }
 
@@ -143,7 +185,7 @@ static int ar71xx_prom_init_myloader(void)
 
        switch (mylo->did) {
        case DEVID_COMPEX_WP543:
-               ar71xx_mach_type = AR71XX_MACH_WP543;
+               ar71xx_mach = AR71XX_MACH_WP543;
                break;
        default:
                printk(KERN_WARNING "prom: unknown device id: %x\n",
@@ -162,11 +204,11 @@ static void ar71xx_prom_init_generic(void)
        ar71xx_prom_argv = (char **)fw_arg1;
        ar71xx_prom_envp = (char **)fw_arg2;
 
-       p = ar71xx_prom_getenv("board");
+       p = ar71xx_prom_getargv("board");
        if (!p)
-               p = ar71xx_prom_getargv("board");
+               p = ar71xx_prom_getenv("board");
        if (p)
-               ar71xx_mach_type = find_board_byname(p);
+               ar71xx_mach = find_board_byname(p);
 
        p = ar71xx_prom_getenv("ethaddr");
        if (!p)
@@ -182,7 +224,7 @@ void __init prom_init(void)
                        (unsigned int)fw_arg0, (unsigned int)fw_arg1,
                        (unsigned int)fw_arg2, (unsigned int)fw_arg3);
 
-       ar71xx_mach_type = AR71XX_MACH_GENERIC;
+       ar71xx_mach = AR71XX_MACH_GENERIC;
 
        if (ar71xx_prom_init_myloader())
                return;
@@ -194,16 +236,3 @@ void __init prom_free_prom_memory(void)
 {
        /* We do not have to prom memory to free */
 }
-
-#define UART_READ(r) \
-       __raw_readl((void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE) + 4 * (r)))
-
-#define UART_WRITE(r, v) \
-       __raw_writel((v), (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE) + 4*(r)))
-
-void prom_putchar(unsigned char ch)
-{
-       while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0);
-       UART_WRITE(UART_TX, ch);
-       while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0);
-}