diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-01-29 00:30:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-02-04 13:15:24 +0000 |
| commit | 2bea80187f6218ed8b5c1e1280220b1c53d8dd05 (patch) | |
| tree | 854b0b4c9a7357e2079d83baf7f563dad2766434 /include/asm-arm/arch-ixp4xx | |
| parent | 14645ebabd96d29f3050ea78a6417b6653bc48cf (diff) | |
| download | kernel-crypto-2bea80187f6218ed8b5c1e1280220b1c53d8dd05.tar.gz kernel-crypto-2bea80187f6218ed8b5c1e1280220b1c53d8dd05.tar.xz kernel-crypto-2bea80187f6218ed8b5c1e1280220b1c53d8dd05.zip | |
[ARM] 4769/2: ixp4xx: Button updates for the dsmg600 board
* Remove the superfluous declaration of ctrl_alt_del().
* Convert GPIO and IRQ handling to use the <asm/gpio.h> api.
* Perform the reset on the release of the power button, so that
NAS devices which have been set to auto-power-on (by solder
bridging the power button) do not continuously power cycle.
* Remove all superflous constants from dsmg600.h
Signed-off-by: Rod Whitby <rod@whitby.id.au>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-ixp4xx')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/dsmg600.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-arm/arch-ixp4xx/dsmg600.h b/include/asm-arm/arch-ixp4xx/dsmg600.h index a19605ad240..b7673e171ab 100644 --- a/include/asm-arm/arch-ixp4xx/dsmg600.h +++ b/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) |