Upgrade the power and reset button handling for the DSMG600: * Remove the superfluous declaration of ctrl_alt_del(). * Convert GPIO and IRQ handling to use the api. * Perform the reset on the release of the power button, so that NAS devices which have been set to auto-power-on (by bridging the power button) do not continuously power cycle. * Remove all superflous constants from dsmg600.h Signed-off-by: Rod Whitby --- arch/arm/mach-ixp4xx/dsmg600-power.c | 24 ++++++++++++++---------- include/asm-arm/arch-ixp4xx/dsmg600.h | 7 +------ 2 files changed, 15 insertions(+), 16 deletions(-) Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/dsmg600-power.c =================================================================== --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/dsmg600-power.c +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/dsmg600-power.c @@ -26,10 +26,9 @@ #include #include +#include #include -extern void ctrl_alt_del(void); - /* This is used to make sure the power-button pusher is serious. The button * must be held until the value of this counter reaches zero. */ @@ -47,9 +46,16 @@ static void dsmg600_power_handler(unsign * state of the power button. */ - if (*IXP4XX_GPIO_GPINR & DSMG600_PB_BM) { + if (gpio_get_value(DSMG600_PB_GPIO)) { /* IO Pin is 1 (button pushed) */ + if (power_button_countdown > 0) { + power_button_countdown--; + } + + } else { + + /* Done on button release, to allow for auto-power-on mods. */ if (power_button_countdown == 0) { /* Signal init to do the ctrlaltdel action, this will bypass * init if it hasn't started and do a kernel_restart. @@ -58,11 +64,9 @@ static void dsmg600_power_handler(unsign /* Change the state of the power LED to "blink" */ gpio_line_set(DSMG600_LED_PWR_GPIO, IXP4XX_GPIO_LOW); + } else { + power_button_countdown = PBUTTON_HOLDDOWN_COUNT; } - power_button_countdown--; - - } else { - power_button_countdown = PBUTTON_HOLDDOWN_COUNT; } mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500)); @@ -81,12 +85,12 @@ static int __init dsmg600_power_init(voi if (!(machine_is_dsmg600())) return 0; - if (request_irq(DSMG600_RB_IRQ, &dsmg600_reset_handler, + if (request_irq(gpio_to_irq(DSMG600_RB_GPIO), &dsmg600_reset_handler, IRQF_DISABLED | IRQF_TRIGGER_LOW, "DSM-G600 reset button", NULL) < 0) { printk(KERN_DEBUG "Reset Button IRQ %d not available\n", - DSMG600_RB_IRQ); + gpio_to_irq(DSMG600_RB_GPIO)); return -EIO; } @@ -114,7 +118,7 @@ static void __exit dsmg600_power_exit(vo del_timer_sync(&dsmg600_power_timer); - free_irq(DSMG600_RB_IRQ, NULL); + free_irq(gpio_to_irq(DSMG600_RB_GPIO), NULL); } module_init(dsmg600_power_init); Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/dsmg600.h =================================================================== --- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/dsmg600.h +++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/dsmg600.h @@ -40,18 +40,13 @@ /* Buttons */ #define DSMG600_PB_GPIO 15 /* power button */ -#define DSMG600_PB_BM (1L << DSMG600_PB_GPIO) - #define DSMG600_RB_GPIO 3 /* reset button */ -#define DSMG600_RB_IRQ IRQ_IXP4XX_GPIO3 +/* Power control */ #define DSMG600_PO_GPIO 2 /* power off */ /* LEDs */ #define DSMG600_LED_PWR_GPIO 0 -#define DSMG600_LED_PWR_BM (1L << DSMG600_LED_PWR_GPIO) - #define DSMG600_LED_WLAN_GPIO 14 -#define DSMG600_LED_WLAN_BM (1L << DSMG600_LED_WLAN_GPIO)