Skip to content

Commit

Permalink
MIPS: RB532: Remove gpio bootup state
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Florian Fainelli authored and Ralf Baechle committed Oct 11, 2008
1 parent 3c8cf8c commit 49afa0a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
10 changes: 0 additions & 10 deletions arch/mips/rb532/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ extern void __init setup_serial_port(void);

unsigned int idt_cpu_freq = 132000000;
EXPORT_SYMBOL(idt_cpu_freq);
unsigned int gpio_bootup_state;
EXPORT_SYMBOL(gpio_bootup_state);

static struct resource ddr_reg[] = {
{
Expand Down Expand Up @@ -108,9 +106,6 @@ void __init prom_setup_cmdline(void)
mips_machtype = MACH_MIKROTIK_RB532;
}

if (match_tag(prom_argv[i], GPIO_TAG))
gpio_bootup_state = tag2ul(prom_argv[i], GPIO_TAG);

strcpy(cp, prom_argv[i]);
cp += strlen(prom_argv[i]);
}
Expand All @@ -122,11 +117,6 @@ void __init prom_setup_cmdline(void)
strcpy(cp, arcs_cmdline);
cp += strlen(arcs_cmdline);
}
if (gpio_bootup_state & 0x02)
strcpy(cp, GPIO_INIT_NOBUTTON);
else
strcpy(cp, GPIO_INIT_BUTTON);

cmd_line[CL_SIZE-1] = '\0';

strcpy(arcs_cmdline, cmd_line);
Expand Down
4 changes: 0 additions & 4 deletions include/asm-mips/mach-rc32434/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,10 @@

#define PROM_ENTRY(x) (0xbfc00000 + ((x) * 8))

#define GPIO_INIT_NOBUTTON ""
#define GPIO_INIT_BUTTON " 2"

#define SR_NMI 0x00180000
#define SERIAL_SPEED_ENTRY 0x00000001

#define FREQ_TAG "HZ="
#define GPIO_TAG "gpio="
#define KMAC_TAG "kmac="
#define MEM_TAG "mem="
#define BOARD_TAG "board="
Expand Down

0 comments on commit 49afa0a

Please sign in to comment.