From 324c4009be74efbb6337762ded920cb44d3fe5fb Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 2 Oct 2007 14:23:27 +0000 Subject: Rewrite platform code to be smarter git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9094 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/rdc/files/arch/i386/mach-rdc/platform.c | 49 +++++++++++++++------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/target/linux/rdc/files/arch/i386/mach-rdc/platform.c b/target/linux/rdc/files/arch/i386/mach-rdc/platform.c index 6809dcdd3f..78f1d0b7c6 100644 --- a/target/linux/rdc/files/arch/i386/mach-rdc/platform.c +++ b/target/linux/rdc/files/arch/i386/mach-rdc/platform.c @@ -28,12 +28,16 @@ #include #include #include +#include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) +#include +#endif #include #define PFX "rdc321x: " -/* FIXME : Flash */ +/* Flash */ static struct resource rdc_flash_resource[] = { [0] = { .start = (u32)-CONFIG_MTD_RDC3210_SIZE, @@ -50,34 +54,47 @@ static struct platform_device rdc_flash_device = { }; /* LEDS */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) +static struct gpio_led default_leds[] = { + { .name = "rdc:dmz", .gpio = 1, .active_low = 1, }, +}; + +static struct gpio_led_platform_data rdc321x_led_data = { + .num_leds = ARRAY_SIZE(default_leds), + .leds = default_leds, +}; + +static struct platform_device rdc321x_leds = { + .name = "leds-gpio", + .id = -1, + .dev = { + .platform_data = &rdc321x_led_data, + } +}; +#else static struct platform_device rdc321x_leds = { - .name = "rdc321x-leds", + .name "rdc321x-leds", .id = -1, .num_resources = 0, }; +#endif +/* Watchdog */ static struct platform_device rdc321x_wdt = { .name = "rdc321x-wdt", .id = -1, .num_resources = 0, }; +static struct platform_device *rdc321x_devs[] = { + &rdc_flash_device, + &rdc321x_leds, + &rdc321x_wdt +}; + static int __init rdc_board_setup(void) { - int err; - - err = platform_device_register(&rdc_flash_device); - if (err) - printk(KERN_ALERT PFX "failed to register flash\n"); - - err = platform_device_register(&rdc321x_leds); - if (err) - printk(KERN_ALERT PFX "failed to register LEDS\n"); - - err = platform_device_register(&rdc321x_wdt); - printk(KERN_ALERT PFX "failed to register watchdog\n"); - - return err; + return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs)); } arch_initcall(rdc_board_setup); -- cgit v1.2.3