diff options
author | Florian Fainelli <florian@openwrt.org> | 2008-08-22 11:01:31 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-10-11 11:18:45 -0400 |
commit | 49afa0a15180c22c8836ef36edd6aa48ab7b2915 (patch) | |
tree | d2117d64dee8233ca339fa762be2ba66884981c9 /arch/mips/rb532 | |
parent | 3c8cf8caa5b217fbb17d0dce7f6bbec1d7da7249 (diff) |
MIPS: RB532: Remove gpio bootup state
We are no longer using gpio bootup state, so do not export
it and do not parse the kernel command line tag for it.
Instead we provide gpio-keys for the button the gpio bootup
state was checking.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/rb532')
-rw-r--r-- | arch/mips/rb532/prom.c | 10 |
1 files changed, 0 insertions, 10 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 | ||
42 | unsigned int idt_cpu_freq = 132000000; | 42 | unsigned int idt_cpu_freq = 132000000; |
43 | EXPORT_SYMBOL(idt_cpu_freq); | 43 | EXPORT_SYMBOL(idt_cpu_freq); |
44 | unsigned int gpio_bootup_state; | ||
45 | EXPORT_SYMBOL(gpio_bootup_state); | ||
46 | 44 | ||
47 | static struct resource ddr_reg[] = { | 45 | static 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); |