diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-28 21:00:01 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-28 21:00:01 +0000 |
commit | 58f98ac38244ed93bb01dcf377937f1aec45202b (patch) | |
tree | 35b9cc8a3d433d2c1bb70fe82b947f404becf8c2 /target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch | |
parent | ff57652cf6b0f7a2f7e6f99a3293fbac1d0b6c5d (diff) |
* upgrade ixp4xx to 2.6.23.12
* upgrade to the new ethernet driver (temporary breaks Marvell switch support on Compex units)
* handle NPE microcodes in a user friendly way - YAY for Intel for changing the license
* add support for the Lanready AP1000 (used in for example the Ligowave LGO2AGN)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10016 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch b/target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch new file mode 100644 index 000000000..25709da4f --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch @@ -0,0 +1,36 @@ +--- + arch/arm/mach-ixp4xx/dsmg600-power.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +Index: linux-2.6.22-rc5-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c +=================================================================== +--- linux-2.6.22-rc5-armeb.orig/arch/arm/mach-ixp4xx/dsmg600-power.c ++++ linux-2.6.22-rc5-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c +@@ -50,6 +50,13 @@ + if (*IXP4XX_GPIO_GPINR & DSMG600_PB_BM) { + + /* 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 +65,9 @@ + + /* 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)); |