ar71xx: merge WZR-HP-G301NH support into WZR-HP-G300NH

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / dev-gpio-buttons.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-gpio-buttons.c b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-gpio-buttons.c
index 85ba33e..c22e652 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/dev-gpio-buttons.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/dev-gpio-buttons.c
@@ -15,14 +15,14 @@
 
 #include "dev-gpio-buttons.h"
 
-void __init ar71xx_add_device_gpio_buttons(int id,
-                                          unsigned poll_interval,
-                                          unsigned nbuttons,
-                                          struct gpio_button *buttons)
+void __init ar71xx_register_gpio_keys_polled(int id,
+                                            unsigned poll_interval,
+                                            unsigned nbuttons,
+                                            struct gpio_keys_button *buttons)
 {
        struct platform_device *pdev;
-       struct gpio_buttons_platform_data pdata;
-       struct gpio_button *p;
+       struct gpio_keys_platform_data pdata;
+       struct gpio_keys_button *p;
        int err;
 
        p = kmalloc(nbuttons * sizeof(*p), GFP_KERNEL);
@@ -31,7 +31,7 @@ void __init ar71xx_add_device_gpio_buttons(int id,
 
        memcpy(p, buttons, nbuttons * sizeof(*p));
 
-       pdev = platform_device_alloc("gpio-buttons", id);
+       pdev = platform_device_alloc("gpio-keys-polled", id);
        if (!pdev)
                goto err_free_buttons;
 
@@ -44,7 +44,6 @@ void __init ar71xx_add_device_gpio_buttons(int id,
        if (err)
                goto err_put_pdev;
 
-
        err = platform_device_add(pdev);
        if (err)
                goto err_put_pdev;