aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/dns323-setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-orion5x/dns323-setup.c')
-rw-r--r--arch/arm/mach-orion5x/dns323-setup.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index c3ed15b8ea25..d470864b4e42 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -86,7 +86,6 @@ static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
86 86
87static struct hw_pci dns323_pci __initdata = { 87static struct hw_pci dns323_pci __initdata = {
88 .nr_controllers = 2, 88 .nr_controllers = 2,
89 .swizzle = pci_std_swizzle,
90 .setup = orion5x_pci_sys_setup, 89 .setup = orion5x_pci_sys_setup,
91 .scan = orion5x_pci_sys_scan_bus, 90 .scan = orion5x_pci_sys_scan_bus,
92 .map_irq = dns323_pci_map_irq, 91 .map_irq = dns323_pci_map_irq,
@@ -253,27 +252,6 @@ error_fail:
253 * GPIO LEDs (simple - doesn't use hardware blinking support) 252 * GPIO LEDs (simple - doesn't use hardware blinking support)
254 */ 253 */
255 254
256#define ORION_BLINK_HALF_PERIOD 100 /* ms */
257
258static int dns323_gpio_blink_set(unsigned gpio, int state,
259 unsigned long *delay_on, unsigned long *delay_off)
260{
261
262 if (delay_on && delay_off && !*delay_on && !*delay_off)
263 *delay_on = *delay_off = ORION_BLINK_HALF_PERIOD;
264
265 switch(state) {
266 case GPIO_LED_NO_BLINK_LOW:
267 case GPIO_LED_NO_BLINK_HIGH:
268 orion_gpio_set_blink(gpio, 0);
269 gpio_set_value(gpio, state);
270 break;
271 case GPIO_LED_BLINK:
272 orion_gpio_set_blink(gpio, 1);
273 }
274 return 0;
275}
276
277static struct gpio_led dns323ab_leds[] = { 255static struct gpio_led dns323ab_leds[] = {
278 { 256 {
279 .name = "power:blue", 257 .name = "power:blue",
@@ -312,13 +290,13 @@ static struct gpio_led dns323c_leds[] = {
312static struct gpio_led_platform_data dns323ab_led_data = { 290static struct gpio_led_platform_data dns323ab_led_data = {
313 .num_leds = ARRAY_SIZE(dns323ab_leds), 291 .num_leds = ARRAY_SIZE(dns323ab_leds),
314 .leds = dns323ab_leds, 292 .leds = dns323ab_leds,
315 .gpio_blink_set = dns323_gpio_blink_set, 293 .gpio_blink_set = orion_gpio_led_blink_set,
316}; 294};
317 295
318static struct gpio_led_platform_data dns323c_led_data = { 296static struct gpio_led_platform_data dns323c_led_data = {
319 .num_leds = ARRAY_SIZE(dns323c_leds), 297 .num_leds = ARRAY_SIZE(dns323c_leds),
320 .leds = dns323c_leds, 298 .leds = dns323c_leds,
321 .gpio_blink_set = dns323_gpio_blink_set, 299 .gpio_blink_set = orion_gpio_led_blink_set,
322}; 300};
323 301
324static struct platform_device dns323_gpio_leds = { 302static struct platform_device dns323_gpio_leds = {