adm5120: nuke adm5120_mach_type, use mips_machtype instead

[librecmc/librecmc.git] / target / linux / adm5120 / files / arch / mips / adm5120 / common / prom.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
index 5b2e45defec77827bc0920f33c9e429cba80578d..81ba365a0ee5ae07b582439f1ccb7db57bb182d3 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
@@ -13,15 +13,11 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/io.h>
 
-#include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 #include <asm/mips_machine.h>
 
 #include <asm/mach-adm5120/adm5120_info.h>
-#include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_uart.h>
 
 #include <prom/cfe.h>
 #include <prom/generic.h>
@@ -206,35 +202,35 @@ static void __init prom_detect_machtype(void)
 {
        if (bootbase_present()) {
                adm5120_prom_type = ADM5120_PROM_BOOTBASE;
-               adm5120_mach_type = detect_machtype_bootbase();
+               mips_machtype = detect_machtype_bootbase();
                return;
        }
 
        if (cfe_present()) {
                adm5120_prom_type = ADM5120_PROM_CFE;
-               adm5120_mach_type = detect_machtype_cfe();
+               mips_machtype = detect_machtype_cfe();
                return;
        }
 
        if (myloader_present()) {
                adm5120_prom_type = ADM5120_PROM_MYLOADER;
-               adm5120_mach_type = detect_machtype_myloader();
+               mips_machtype = detect_machtype_myloader();
                return;
        }
 
        if (routerboot_present()) {
                adm5120_prom_type = ADM5120_PROM_ROUTERBOOT;
-               adm5120_mach_type = detect_machtype_routerboot();
+               mips_machtype = detect_machtype_routerboot();
                return;
        }
 
        if (generic_prom_present()) {
                adm5120_prom_type = ADM5120_PROM_GENERIC;
-               adm5120_mach_type = detect_machtype_generic();
+               mips_machtype = detect_machtype_generic();
                return;
        }
 
-       adm5120_mach_type = MACH_ADM5120_GENERIC;
+       mips_machtype = MACH_ADM5120_GENERIC;
 }
 
 #ifdef CONFIG_IMAGE_CMDLINE_HACK
@@ -254,18 +250,6 @@ static void __init prom_init_cmdline(void)
 static void inline prom_init_cmdline(void) {}
 #endif /* CONFIG_IMAGE_CMDLINE_HACK */
 
-#define UART_READ(r) \
-       __raw_readl((void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
-#define UART_WRITE(r, v) \
-       __raw_writel((v), (void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
-
-void __init prom_putchar(char ch)
-{
-       while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
-       UART_WRITE(UART_REG_DATA, ch);
-       while ((UART_READ(UART_REG_FLAG) & UART_FLAG_TXFE) == 0);
-}
-
 void __init prom_init(void)
 {
        prom_detect_machtype();