aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMichael-Luke Jones <mlj28@cam.ac.uk>2007-05-23 17:41:53 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-26 05:09:39 -0400
commitcc50a0df51e4f2a7982ade338b3d74825ca67e08 (patch)
tree2c45b932542678b7f51911edd1bbff006527c22b /arch/arm
parent435c5da00b9610f9664c5d6f38dfdafce419ef4a (diff)
[ARM] 4406/1: Trivial NSLU2 / NAS-100D header & setup code cleanup
This trivial patch updates the nslu2 and nas-100d headers to remove pointless GPIO defines, and updates nslu2-setup.c accordingly. In addition minor style cleanups to some comments are included. Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ixp4xx/nas100d-setup.c3
-rw-r--r--arch/arm/mach-ixp4xx/nslu2-setup.c19
2 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 9a31444d9214..78a17413ceca 100644
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -155,7 +155,8 @@ static void __init nas100d_init(void)
155 155
156 pm_power_off = nas100d_power_off; 156 pm_power_off = nas100d_power_off;
157 157
158 /* This is only useful on a modified machine, but it is valuable 158 /*
159 * This is only useful on a modified machine, but it is valuable
159 * to have it first in order to see debug messages, and so that 160 * to have it first in order to see debug messages, and so that
160 * it does *not* get removed if platform_add_devices fails! 161 * it does *not* get removed if platform_add_devices fails!
161 */ 162 */
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index 1aa45a2e6d62..9bf8ccbcaccf 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -50,26 +50,26 @@ static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = {
50static struct resource nslu2_led_resources[] = { 50static struct resource nslu2_led_resources[] = {
51 { 51 {
52 .name = "ready", /* green led */ 52 .name = "ready", /* green led */
53 .start = NSLU2_LED_GRN, 53 .start = NSLU2_LED_GRN_GPIO,
54 .end = NSLU2_LED_GRN, 54 .end = NSLU2_LED_GRN_GPIO,
55 .flags = IXP4XX_GPIO_HIGH, 55 .flags = IXP4XX_GPIO_HIGH,
56 }, 56 },
57 { 57 {
58 .name = "status", /* red led */ 58 .name = "status", /* red led */
59 .start = NSLU2_LED_RED, 59 .start = NSLU2_LED_RED_GPIO,
60 .end = NSLU2_LED_RED, 60 .end = NSLU2_LED_RED_GPIO,
61 .flags = IXP4XX_GPIO_HIGH, 61 .flags = IXP4XX_GPIO_HIGH,
62 }, 62 },
63 { 63 {
64 .name = "disk-1", 64 .name = "disk-1",
65 .start = NSLU2_LED_DISK1, 65 .start = NSLU2_LED_DISK1_GPIO,
66 .end = NSLU2_LED_DISK1, 66 .end = NSLU2_LED_DISK1_GPIO,
67 .flags = IXP4XX_GPIO_LOW, 67 .flags = IXP4XX_GPIO_LOW,
68 }, 68 },
69 { 69 {
70 .name = "disk-2", 70 .name = "disk-2",
71 .start = NSLU2_LED_DISK2, 71 .start = NSLU2_LED_DISK2_GPIO,
72 .end = NSLU2_LED_DISK2, 72 .end = NSLU2_LED_DISK2_GPIO,
73 .flags = IXP4XX_GPIO_LOW, 73 .flags = IXP4XX_GPIO_LOW,
74 }, 74 },
75}; 75};
@@ -181,7 +181,8 @@ static void __init nslu2_init(void)
181 181
182 pm_power_off = nslu2_power_off; 182 pm_power_off = nslu2_power_off;
183 183
184 /* This is only useful on a modified machine, but it is valuable 184 /*
185 * This is only useful on a modified machine, but it is valuable
185 * to have it first in order to see debug messages, and so that 186 * to have it first in order to see debug messages, and so that
186 * it does *not* get removed if platform_add_devices fails! 187 * it does *not* get removed if platform_add_devices fails!
187 */ 188 */