ar7: clocks setup (prerequisite for dsl/usb) and misc cleanups.

[librecmc/librecmc.git] / target / linux / ar7-2.6 / files / arch / mips / ar7 / prom.c

diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
index 7176be30220aab37c3cdb7220d9b0ef70a78297e..e613164f065c2ca53c3e9917079f7350395911cc 100644 (file)
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
@@ -47,7 +47,7 @@ struct psp_chip_map {
 /* I hate this. No. *I* *HATE* *THIS* */
 static __initdata struct psp_chip_map psp_chip_map[] = {
        {
-               .chip = 0x5,
+               .chip = AR7_CHIP_7100,
                .names = {
                        "dummy", "cpufrequency", "memsize",
                        "flashsize", "modetty0", "modetty1", "prompt",
@@ -65,7 +65,7 @@ static __initdata struct psp_chip_map psp_chip_map[] = {
                },
        },
        {
-               .chip = 0x18,
+               .chip = AR7_CHIP_7200,
                .names = {
                        "dummy", "cpufrequency", "memsize",
                        "flashsize", "modetty0", "modetty1", "prompt",
@@ -83,7 +83,7 @@ static __initdata struct psp_chip_map psp_chip_map[] = {
                },
        },
        {
-               .chip = 0x2b,
+               .chip = AR7_CHIP_7300,
                .names = {
                        "dummy", "cpufrequency", "memsize",
                        "flashsize", "modetty0", "modetty1", "prompt",
@@ -186,7 +186,7 @@ static int __init parse_psp_env(void *start)
        char *src, *dest, *name, *value;
        struct psp_env_var *vars = start;
 
-       chip = get_chip_id();
+       chip = ar7_chip_id();
        for (map = psp_chip_map; map->chip; map++)
                if (map->chip == chip)
                        break;