From e8814df597d0bd905bafa4271dd904709347a50d Mon Sep 17 00:00:00 2001 From: Ladislav Michl Date: Thu, 28 Jul 2005 03:36:53 -0700 Subject: [PATCH] [PATCH] ARM: OMAP: voiceblue cleanup Remove temporary workaround. --- arch/arm/mach-omap1/board-voiceblue.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index a6f83fc9fb9..209d79ef1d5 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c @@ -28,11 +28,11 @@ #include #include +#include #include -#include #include +#include #include -#include extern void omap_init_time(void); extern int omap_gpio_init(void); @@ -150,12 +150,9 @@ static struct omap_mmc_config voiceblue_mmc_config __initdata = { }, }; -static struct omap_boot_reason_config voiceblue_boot_reason; - static struct omap_board_config_kernel voiceblue_config[] = { { OMAP_TAG_USB, &voiceblue_usb_config }, { OMAP_TAG_MMC, &voiceblue_mmc_config }, - { OMAP_TAG_BOOT_REASON, &voiceblue_boot_reason }, }; static void __init voiceblue_init_irq(void) @@ -168,8 +165,6 @@ static void __init voiceblue_init(void) { /* Watchdog */ omap_request_gpio(0); - /* INIT button */ - omap_request_gpio(1); /* smc91x reset */ omap_request_gpio(7); omap_set_gpio_direction(7, 0); @@ -238,13 +233,6 @@ static int __init voiceblue_setup(void) /* Setup panic notifier */ notifier_chain_register(&panic_notifier_list, &panic_block); - /* This information should come from bootloader. We do it here for - * now... Pushing "init" button (hangs on GPIO1) during power on - * resets device to factory defaults */ - omap_set_gpio_direction(1, 1); - sprintf(voiceblue_boot_reason.reason_str, "poweron%s", - omap_get_gpio_datain(1) ? "" : "-R"); - return 0; } postcore_initcall(voiceblue_setup); -- 2.41.0