[ARM] 4807/2: ixp4xx: Merge nslu2-power.c into nslu2-setup.c

[linux-2.6] / include / asm-arm / arch-ixp4xx / nslu2.h

diff --git a/include/asm-arm/arch-ixp4xx/nslu2.h b/include/asm-arm/arch-ixp4xx/nslu2.h
index 4281838873eff89156e49a0c0e4c7500fc9505f1..714bbc65126af1c26a3303ab79c659dfd65f8bc3 100644 (file)
--- a/include/asm-arm/arch-ixp4xx/nslu2.h
+++ b/include/asm-arm/arch-ixp4xx/nslu2.h
@@ -9,7 +9,7 @@
  * based on ixdp425.h:
  *     Copyright 2004 (c) MontaVista, Software, Inc.
  *
- * This file is licensed under  the terms of the GNU General Public
+ * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
@@ -34,60 +34,22 @@
 #define NSLU2_PCI_INTC_PIN     9
 #define NSLU2_PCI_INTD_PIN     8
 
-
 /* NSLU2 Timer */
 #define NSLU2_FREQ 66000000
-#define NSLU2_CLOCK_TICK_RATE (((NSLU2_FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ)
-#define NSLU2_CLOCK_TICKS_PER_USEC ((NSLU2_CLOCK_TICK_RATE + USEC_PER_SEC/2) / USEC_PER_SEC)
-
-/* GPIO */
-
-#define NSLU2_GPIO0            0
-#define NSLU2_GPIO1            1
-#define NSLU2_GPIO2            2
-#define NSLU2_GPIO3            3
-#define NSLU2_GPIO4            4
-#define NSLU2_GPIO5            5
-#define NSLU2_GPIO6            6
-#define NSLU2_GPIO7            7
-#define NSLU2_GPIO8            8
-#define NSLU2_GPIO9            9
-#define NSLU2_GPIO10           10
-#define NSLU2_GPIO11           11
-#define NSLU2_GPIO12           12
-#define NSLU2_GPIO13           13
-#define NSLU2_GPIO14           14
-#define NSLU2_GPIO15           15
 
 /* Buttons */
 
-#define NSLU2_PB_GPIO          NSLU2_GPIO5
-#define NSLU2_PO_GPIO          NSLU2_GPIO8     /* power off */
-#define NSLU2_RB_GPIO          NSLU2_GPIO12
-
-#define NSLU2_PB_IRQ           IRQ_IXP4XX_GPIO5
-#define NSLU2_RB_IRQ           IRQ_IXP4XX_GPIO12
-
-#define NSLU2_PB_BM            (1L << NSLU2_PB_GPIO)
-#define NSLU2_PO_BM            (1L << NSLU2_PO_GPIO)
-#define NSLU2_RB_BM            (1L << NSLU2_RB_GPIO)
+#define NSLU2_PB_GPIO          5       /* power button */
+#define NSLU2_PO_GPIO          8       /* power off */
+#define NSLU2_RB_GPIO          12      /* reset button */
 
 /* Buzzer */
 
 #define NSLU2_GPIO_BUZZ                4
-#define NSLU2_BZ_BM            (1L << NSLU2_GPIO_BUZZ)
-/* LEDs */
-
-#define NSLU2_LED_RED          NSLU2_GPIO0
-#define NSLU2_LED_GRN          NSLU2_GPIO1
-
-#define NSLU2_LED_RED_BM       (1L << NSLU2_LED_RED)
-#define NSLU2_LED_GRN_BM       (1L << NSLU2_LED_GRN)
-
-#define NSLU2_LED_DISK1                NSLU2_GPIO2
-#define NSLU2_LED_DISK2                NSLU2_GPIO3
-
-#define NSLU2_LED_DISK1_BM     (1L << NSLU2_GPIO2)
-#define NSLU2_LED_DISK2_BM     (1L << NSLU2_GPIO3)
 
+/* LEDs */
 
+#define NSLU2_LED_RED_GPIO     0
+#define NSLU2_LED_GRN_GPIO     1
+#define NSLU2_LED_DISK1_GPIO   3
+#define NSLU2_LED_DISK2_GPIO   2