diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx/nslu2-setup.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-setup.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c index da9340a53434..55411f21d838 100644 --- a/arch/arm/mach-ixp4xx/nslu2-setup.c +++ b/arch/arm/mach-ixp4xx/nslu2-setup.c | |||
@@ -27,8 +27,6 @@ static struct flash_platform_data nslu2_flash_data = { | |||
27 | }; | 27 | }; |
28 | 28 | ||
29 | static struct resource nslu2_flash_resource = { | 29 | static struct resource nslu2_flash_resource = { |
30 | .start = NSLU2_FLASH_BASE, | ||
31 | .end = NSLU2_FLASH_BASE + NSLU2_FLASH_SIZE, | ||
32 | .flags = IORESOURCE_MEM, | 30 | .flags = IORESOURCE_MEM, |
33 | }; | 31 | }; |
34 | 32 | ||
@@ -52,6 +50,12 @@ static struct platform_device nslu2_i2c_controller = { | |||
52 | .num_resources = 0, | 50 | .num_resources = 0, |
53 | }; | 51 | }; |
54 | 52 | ||
53 | static struct platform_device nslu2_beeper = { | ||
54 | .name = "ixp4xx-beeper", | ||
55 | .id = NSLU2_GPIO_BUZZ, | ||
56 | .num_resources = 0, | ||
57 | }; | ||
58 | |||
55 | static struct resource nslu2_uart_resources[] = { | 59 | static struct resource nslu2_uart_resources[] = { |
56 | { | 60 | { |
57 | .start = IXP4XX_UART1_BASE_PHYS, | 61 | .start = IXP4XX_UART1_BASE_PHYS, |
@@ -99,6 +103,7 @@ static struct platform_device *nslu2_devices[] __initdata = { | |||
99 | &nslu2_i2c_controller, | 103 | &nslu2_i2c_controller, |
100 | &nslu2_flash, | 104 | &nslu2_flash, |
101 | &nslu2_uart, | 105 | &nslu2_uart, |
106 | &nslu2_beeper, | ||
102 | }; | 107 | }; |
103 | 108 | ||
104 | static void nslu2_power_off(void) | 109 | static void nslu2_power_off(void) |
@@ -116,6 +121,10 @@ static void __init nslu2_init(void) | |||
116 | { | 121 | { |
117 | ixp4xx_sys_init(); | 122 | ixp4xx_sys_init(); |
118 | 123 | ||
124 | nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); | ||
125 | nslu2_flash_resource.end = | ||
126 | IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; | ||
127 | |||
119 | pm_power_off = nslu2_power_off; | 128 | pm_power_off = nslu2_power_off; |
120 | 129 | ||
121 | platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); | 130 | platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); |