Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[cascardo/linux.git] / arch / mips / ar7 / platform.c

diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 33ffecf..1a24d31 100644 (file)
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -462,6 +462,40 @@ static struct gpio_led fb_fon_leds[] = {
        },
 };
 
+static struct gpio_led gt701_leds[] = {
+       {
+               .name                   = "inet:green",
+               .gpio                   = 13,
+               .active_low             = 1,
+       },
+       {
+               .name                   = "usb",
+               .gpio                   = 12,
+               .active_low             = 1,
+       },
+       {
+               .name                   = "inet:red",
+               .gpio                   = 9,
+               .active_low             = 1,
+       },
+       {
+               .name                   = "power:red",
+               .gpio                   = 7,
+               .active_low             = 1,
+       },
+       {
+               .name                   = "power:green",
+               .gpio                   = 8,
+               .active_low             = 1,
+               .default_trigger        = "default-on",
+       },
+        {
+                .name                   = "ethernet",
+                .gpio                   = 10,
+                .active_low             = 1,
+        },
+};
+
 static struct gpio_led_platform_data ar7_led_data;
 
 static struct platform_device ar7_gpio_leds = {
@@ -503,6 +537,9 @@ static void __init detect_leds(void)
        } else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) {
                ar7_led_data.num_leds = ARRAY_SIZE(titan_leds);
                ar7_led_data.leds = titan_leds;
+       } else if (strstr(prid, "GT701")) {
+               ar7_led_data.num_leds = ARRAY_SIZE(gt701_leds);
+               ar7_led_data.leds = gt701_leds;
        }
 }
 
@@ -536,7 +573,7 @@ static int __init ar7_register_uarts(void)
 
        bus_clk = clk_get(NULL, "bus");
        if (IS_ERR(bus_clk))
-               panic("unable to get bus clk\n");
+               panic("unable to get bus clk");
 
        uart_port.type          = PORT_AR7;
        uart_port.uartclk       = clk_get_rate(bus_clk) / 2;