25709da4f08edccf6ca1fb1a283b422ae069b4fa
[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / patches-2.6.23 / 016-dsmg600_auto_power_on.patch
1 ---
2 arch/arm/mach-ixp4xx/dsmg600-power.c | 13 +++++++++----
3 1 file changed, 9 insertions(+), 4 deletions(-)
4
5 Index: linux-2.6.22-rc5-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c
6 ===================================================================
7 --- linux-2.6.22-rc5-armeb.orig/arch/arm/mach-ixp4xx/dsmg600-power.c
8 +++ linux-2.6.22-rc5-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c
9 @@ -50,6 +50,13 @@
10 if (*IXP4XX_GPIO_GPINR & DSMG600_PB_BM) {
11
12 /* IO Pin is 1 (button pushed) */
13 + if (power_button_countdown > 0) {
14 + power_button_countdown--;
15 + }
16 +
17 + } else {
18 +
19 + /* Done on button release, to allow for auto-power-on mods. */
20 if (power_button_countdown == 0) {
21 /* Signal init to do the ctrlaltdel action, this will bypass
22 * init if it hasn't started and do a kernel_restart.
23 @@ -58,11 +65,9 @@
24
25 /* Change the state of the power LED to "blink" */
26 gpio_line_set(DSMG600_LED_PWR_GPIO, IXP4XX_GPIO_LOW);
27 + } else {
28 + power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
29 }
30 - power_button_countdown--;
31 -
32 - } else {
33 - power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
34 }
35
36 mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));