183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: switch rdc to to gpio_keys_polled

Browse Source 
gpio_buttons have been deprecated since a long time.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 37435
This commit is contained in:
Jonas Gorski 2013-07-19 13:20:39 +00:00
parent 6db050194e
commit 960002ed4b
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/x86/patches-3.3/100-rdc_boards.patch
View File

@ -67,7 +67,7 @@
+ +
+/* Button */ +/* Button */
+static struct platform_device rdc321x_buttons = { +static struct platform_device rdc321x_buttons = {
+ .name = "gpio-buttons", + .name = "gpio-keys-polled",
+ .id = -1, + .id = -1,
+ .dev = { + .dev = {
+ .platform_data = &rdcplat_data.button_data, + .platform_data = &rdcplat_data.button_data,
@ -187,7 +187,7 @@
+static struct gpio_led ar525w_leds[] = { +static struct gpio_led ar525w_leds[] = {
+ { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1}, + { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
+}; +};
+static struct gpio_button ar525w_btns[] = { +static struct gpio_keys_button ar525w_btns[] = {
+ { + {
+ .gpio = 6, + .gpio = 6,
+ .code = BTN_0, + .code = BTN_0,
@ -584,7 +584,7 @@
+ { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1}, + { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1},
+}; +};
+ +
+static struct gpio_button sitecom_btns[] = { +static struct gpio_keys_button sitecom_btns[] = {
+ { + {
+ .gpio = 6, + .gpio = 6,
+ .code = BTN_0, + .code = BTN_0,
@ -731,11 +731,11 @@
+#define _RDC_BOARDS_H__ +#define _RDC_BOARDS_H__
+ +
+#include <linux/leds.h> +#include <linux/leds.h>
+#include <linux/gpio_buttons.h> +#include <linux/gpio_keys.h>
+ +
+struct rdc_platform_data { +struct rdc_platform_data {
+ struct gpio_led_platform_data led_data; + struct gpio_led_platform_data led_data;
+ struct gpio_buttons_platform_data button_data; + struct gpio_keys_platform_data button_data;
+}; +};
+ +
+#endif +#endif

10
target/linux/x86/patches-3.7/100-rdc_boards.patch
View File

@ -67,7 +67,7 @@
+ +
+/* Button */ +/* Button */
+static struct platform_device rdc321x_buttons = { +static struct platform_device rdc321x_buttons = {
+ .name = "gpio-buttons", + .name = "gpio-keys-polled",
+ .id = -1, + .id = -1,
+ .dev = { + .dev = {
+ .platform_data = &rdcplat_data.button_data, + .platform_data = &rdcplat_data.button_data,
@ -187,7 +187,7 @@
+static struct gpio_led ar525w_leds[] = { +static struct gpio_led ar525w_leds[] = {
+ { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1}, + { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
+}; +};
+static struct gpio_button ar525w_btns[] = { +static struct gpio_keys_button ar525w_btns[] = {
+ { + {
+ .gpio = 6, + .gpio = 6,
+ .code = BTN_0, + .code = BTN_0,
@ -584,7 +584,7 @@
+ { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1}, + { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1},
+}; +};
+ +
+static struct gpio_button sitecom_btns[] = { +static struct gpio_keys_button sitecom_btns[] = {
+ { + {
+ .gpio = 6, + .gpio = 6,
+ .code = BTN_0, + .code = BTN_0,
@ -731,11 +731,11 @@
+#define _RDC_BOARDS_H__ +#define _RDC_BOARDS_H__
+ +
+#include <linux/leds.h> +#include <linux/leds.h>
+#include <linux/gpio_buttons.h> +#include <linux/gpio_keys.h>
+ +
+struct rdc_platform_data { +struct rdc_platform_data {
+ struct gpio_led_platform_data led_data; + struct gpio_led_platform_data led_data;
+ struct gpio_buttons_platform_data button_data; + struct gpio_keys_platform_data button_data;
+}; +};
+ +
+#endif +#endif

10
target/linux/x86/patches-3.8/100-rdc_boards.patch
View File

@ -67,7 +67,7 @@
+ +
+/* Button */ +/* Button */
+static struct platform_device rdc321x_buttons = { +static struct platform_device rdc321x_buttons = {
+ .name = "gpio-buttons", + .name = "gpio-keys-polled",
+ .id = -1, + .id = -1,
+ .dev = { + .dev = {
+ .platform_data = &rdcplat_data.button_data, + .platform_data = &rdcplat_data.button_data,
@ -187,7 +187,7 @@
+static struct gpio_led ar525w_leds[] = { +static struct gpio_led ar525w_leds[] = {
+ { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1}, + { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
+}; +};
+static struct gpio_button ar525w_btns[] = { +static struct gpio_keys_button ar525w_btns[] = {
+ { + {
+ .gpio = 6, + .gpio = 6,
+ .code = BTN_0, + .code = BTN_0,
@ -584,7 +584,7 @@
+ { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1}, + { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1},
+}; +};
+ +
+static struct gpio_button sitecom_btns[] = { +static struct gpio_keys_button sitecom_btns[] = {
+ { + {
+ .gpio = 6, + .gpio = 6,
+ .code = BTN_0, + .code = BTN_0,
@ -731,11 +731,11 @@
+#define _RDC_BOARDS_H__ +#define _RDC_BOARDS_H__
+ +
+#include <linux/leds.h> +#include <linux/leds.h>
+#include <linux/gpio_buttons.h> +#include <linux/gpio_keys.h>
+ +
+struct rdc_platform_data { +struct rdc_platform_data {
+ struct gpio_led_platform_data led_data; + struct gpio_led_platform_data led_data;
+ struct gpio_buttons_platform_data button_data; + struct gpio_keys_platform_data button_data;
+}; +};
+ +
+#endif +#endif

3
target/linux/x86/rdc/target.mk
View File

@ -5,8 +5,7 @@ MAINTAINER:=Florian Fainelli <florian@openwrt.org>
DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \ DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \
wpad-mini kmod-libphy kmod-r6040 kmod-input-core \ wpad-mini kmod-libphy kmod-r6040 kmod-input-core \
kmod-input-polldev kmod-input-gpio-buttons kmod-button-hotplug \ kmod-input-polldev kmod-button-hotplug kmod-rdc321x-wdt
kmod-rdc321x-wdt
define Target/Description define Target/Description
Build firmware images for RDC321x based routers Build firmware images for RDC321x based routers