ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings

Replace code in board-dnskw with the equivalent devicetree bindings.

Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>

diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
index 6fb0d7e56096b8b86bd991eb6e63d926f867c183..9368382eac2b361ef57e512a33bd197c93b92a63 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -15,6 +15,31 @@
                bootargs = "console=ttyS0,115200n8 earlyprintk";
        };
 
+       gpio-leds {
+               compatible = "gpio-leds";
+               blue-power {
+                       label = "dns320:blue:power";
+                       gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */
+                       linux,default-trigger = "default-on";
+               };
+               blue-usb {
+                       label = "dns320:blue:usb";
+                       gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */
+               };
+               orange-l_hdd {
+                       label = "dns320:orange:l_hdd";
+                       gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */
+               };
+               orange-r_hdd {
+                       label = "dns320:orange:r_hdd";
+                       gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */
+               };
+               orange-usb {
+                       label = "dns320:orange:usb";
+                       gpios = <&gpio1 3 1>; /* GPIO 35 Active Low */
+               };
+       };
+
        ocp@f1000000 {
                serial@12000 {
                        clock-frequency = <166666667>;

diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
index debb3703dfe7bbca4a6b99369280520fc3c3f146..a24597044d5f4f6450383d74dff0e8b99e27ceef 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dns325.dts
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -15,6 +15,31 @@
                bootargs = "console=ttyS0,115200n8 earlyprintk";
        };
 
+       gpio-leds {
+               compatible = "gpio-leds";
+               white-power {
+                       label = "dns325:white:power";
+                       gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */
+                       linux,default-trigger = "default-on";
+               };
+               white-usb {
+                       label = "dns325:white:usb";
+                       gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */
+               };
+               red-l_hdd {
+                       label = "dns325:red:l_hdd";
+                       gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */
+               };
+               red-r_hdd {
+                       label = "dns325:red:r_hdd";
+                       gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */
+               };
+               red-usb {
+                       label = "dns325:red:usb";
+                       gpios = <&gpio0 29 1>; /* GPIO 29 Active Low */
+               };
+       };
+
        ocp@f1000000 {
                i2c@11000 {
                        status = "okay";

diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c
index 1c97efa7705eca650697649aaca0592b6d012dd7..aac9c90715c58c33cc17fb85aa8870ac98bd5227 100644 (file)
--- a/arch/arm/mach-kirkwood/board-dnskw.c
+++ b/arch/arm/mach-kirkwood/board-dnskw.c
@@ -68,90 +68,6 @@ static unsigned int dnskw_mpp_config[] __initdata = {
        0
 };
 
-static struct gpio_led dns325_led_pins[] = {
-       {
-               .name   = "dns325:white:power",
-               .gpio   = 26,
-               .active_low = 1,
-               .default_trigger = "default-on",
-       },
-       {
-               .name   = "dns325:white:usb",
-               .gpio   = 43,
-               .active_low = 1,
-       },
-       {
-               .name   = "dns325:red:l_hdd",
-               .gpio   = 28,
-               .active_low = 1,
-       },
-       {
-               .name   = "dns325:red:r_hdd",
-               .gpio   = 27,
-               .active_low = 1,
-       },
-       {
-               .name   = "dns325:red:usb",
-               .gpio   = 29,
-               .active_low = 1,
-       },
-};
-
-static struct gpio_led_platform_data dns325_led_data = {
-       .num_leds       = ARRAY_SIZE(dns325_led_pins),
-       .leds           = dns325_led_pins,
-};
-
-static struct platform_device dns325_led_device = {
-       .name           = "leds-gpio",
-       .id             = -1,
-       .dev            = {
-               .platform_data  = &dns325_led_data,
-       },
-};
-
-static struct gpio_led dns320_led_pins[] = {
-       {
-               .name   = "dns320:blue:power",
-               .gpio   = 26,
-               .active_low = 1,
-               .default_trigger = "default-on",
-       },
-       {
-               .name   = "dns320:blue:usb",
-               .gpio   = 43,
-               .active_low = 1,
-       },
-       {
-               .name   = "dns320:orange:l_hdd",
-               .gpio   = 28,
-               .active_low = 1,
-       },
-       {
-               .name   = "dns320:orange:r_hdd",
-               .gpio   = 27,
-               .active_low = 1,
-       },
-       {
-               .name   = "dns320:orange:usb",
-               .gpio   = 35,
-               .active_low = 1,
-       },
-};
-
-static struct gpio_led_platform_data dns320_led_data = {
-       .num_leds       = ARRAY_SIZE(dns320_led_pins),
-       .leds           = dns320_led_pins,
-};
-
-static struct platform_device dns320_led_device = {
-       .name           = "leds-gpio",
-       .id             = -1,
-       .dev            = {
-               .platform_data  = &dns320_led_data,
-       },
-};
-
 static struct gpio_keys_button dnskw_button_pins[] = {
        {
                .code           = KEY_POWER,
@@ -237,12 +153,6 @@ void __init dnskw_init(void)
        platform_device_register(&dnskw_button_device);
        platform_device_register(&dnskw_fan_device);
 
-       if (of_machine_is_compatible("dlink,dns-325"))
-               platform_device_register(&dns325_led_device);
-
-       else if (of_machine_is_compatible("dlink,dns-320"))
-               platform_device_register(&dns320_led_device);
-
        /* Register power-off GPIO. */
        if (gpio_request(36, "dnskw:power:off") == 0
            && gpio_direction_output(36, 0) == 0)