Commit 49afa0a1 authored by Florian Fainelli's avatar Florian Fainelli Committed by Ralf Baechle
Browse files

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: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3c8cf8ca

arch/mips/rb532/prom.c

+0 −10
Original line number Diff line number Diff line
@@ -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[] = {

	{
@@ -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]);

	}
@@ -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);

include/asm-mips/mach-rc32434/prom.h

+0 −4
Original line number Diff line number Diff line
@@ -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="