aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/rb532/prom.c10
-rw-r--r--include/asm-mips/mach-rc32434/prom.h4
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c
index 1bc0af8febf4..c5d8868e1b15 100644
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c
@@ -41,8 +41,6 @@ extern void __init setup_serial_port(void);
41 41
42unsigned int idt_cpu_freq = 132000000; 42unsigned int idt_cpu_freq = 132000000;
43EXPORT_SYMBOL(idt_cpu_freq); 43EXPORT_SYMBOL(idt_cpu_freq);
44unsigned int gpio_bootup_state;
45EXPORT_SYMBOL(gpio_bootup_state);
46 44
47static struct resource ddr_reg[] = { 45static struct resource ddr_reg[] = {
48 { 46 {
@@ -108,9 +106,6 @@ void __init prom_setup_cmdline(void)
108 mips_machtype = MACH_MIKROTIK_RB532; 106 mips_machtype = MACH_MIKROTIK_RB532;
109 } 107 }
110 108
111 if (match_tag(prom_argv[i], GPIO_TAG))
112 gpio_bootup_state = tag2ul(prom_argv[i], GPIO_TAG);
113
114 strcpy(cp, prom_argv[i]); 109 strcpy(cp, prom_argv[i]);
115 cp += strlen(prom_argv[i]); 110 cp += strlen(prom_argv[i]);
116 } 111 }
@@ -122,11 +117,6 @@ void __init prom_setup_cmdline(void)
122 strcpy(cp, arcs_cmdline); 117 strcpy(cp, arcs_cmdline);
123 cp += strlen(arcs_cmdline); 118 cp += strlen(arcs_cmdline);
124 } 119 }
125 if (gpio_bootup_state & 0x02)
126 strcpy(cp, GPIO_INIT_NOBUTTON);
127 else
128 strcpy(cp, GPIO_INIT_BUTTON);
129
130 cmd_line[CL_SIZE-1] = '\0'; 120 cmd_line[CL_SIZE-1] = '\0';
131 121
132 strcpy(arcs_cmdline, cmd_line); 122 strcpy(arcs_cmdline, cmd_line);
diff --git a/include/asm-mips/mach-rc32434/prom.h b/include/asm-mips/mach-rc32434/prom.h
index 1d66ddcda89a..660707f1bcce 100644
--- a/include/asm-mips/mach-rc32434/prom.h
+++ b/include/asm-mips/mach-rc32434/prom.h
@@ -28,14 +28,10 @@
28 28
29#define PROM_ENTRY(x) (0xbfc00000 + ((x) * 8)) 29#define PROM_ENTRY(x) (0xbfc00000 + ((x) * 8))
30 30
31#define GPIO_INIT_NOBUTTON ""
32#define GPIO_INIT_BUTTON " 2"
33
34#define SR_NMI 0x00180000 31#define SR_NMI 0x00180000
35#define SERIAL_SPEED_ENTRY 0x00000001 32#define SERIAL_SPEED_ENTRY 0x00000001
36 33
37#define FREQ_TAG "HZ=" 34#define FREQ_TAG "HZ="
38#define GPIO_TAG "gpio="
39#define KMAC_TAG "kmac=" 35#define KMAC_TAG "kmac="
40#define MEM_TAG "mem=" 36#define MEM_TAG "mem="
41#define BOARD_TAG "board=" 37#define BOARD_TAG "board="