summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2007-12-28 21:00:01 +0000
committerImre Kaloz <kaloz@openwrt.org>2007-12-28 21:00:01 +0000
commitefadab3747594aaf96e828e0909eb9525433c236 (patch)
treee21be89886adb2a81cbb726094e699cad23fcfe7 /target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch
parent91c42459f5ef87731628fe1f57fca3d50ee6ab5e (diff)
downloadmaster-31e0f0ae-efadab3747594aaf96e828e0909eb9525433c236.tar.gz
master-31e0f0ae-efadab3747594aaf96e828e0909eb9525433c236.tar.bz2
master-31e0f0ae-efadab3747594aaf96e828e0909eb9525433c236.zip
* 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)
SVN-Revision: 10016
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.patch36
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 0000000000..25709da4f0
--- /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));