X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.18%2F300-reset_buttons.patch;fp=target%2Flinux%2Fbrcm63xx%2Fpatches-3.18%2F300-reset_buttons.patch;h=0000000000000000000000000000000000000000;hp=2263b499ad33b90dfb1a307c4705f4bae52cd447;hb=a00612bf4158769b7fc9795a4f5beec46e9e327a;hpb=1f10696c43780636d75b2ee8d89fb3bde1fc05ca

diff --git a/target/linux/brcm63xx/patches-3.18/300-reset_buttons.patch b/target/linux/brcm63xx/patches-3.18/300-reset_buttons.patch
deleted file mode 100644
index 2263b499ad..0000000000
--- a/target/linux/brcm63xx/patches-3.18/300-reset_buttons.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -10,6 +10,8 @@
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/string.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/input.h>
- #include <asm/addrspace.h>
- #include <bcm63xx_board.h>
- #include <bcm63xx_cpu.h>
-@@ -26,6 +28,9 @@
- 
- #define HCS_OFFSET_128K			0x20000
- 
-+#define BCM963XX_KEYS_POLL_INTERVAL	20
-+#define BCM963XX_KEYS_DEBOUNCE_INTERVAL	(BCM963XX_KEYS_POLL_INTERVAL * 3)
-+
- /*
-  * known 3368 boards
-  */
---- a/arch/mips/bcm63xx/boards/board_common.c
-+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -12,6 +12,7 @@
- #include <linux/string.h>
- #include <linux/platform_device.h>
- #include <linux/ssb/ssb.h>
-+#include <linux/gpio_keys.h>
- #include <asm/addrspace.h>
- #include <bcm63xx_board.h>
- #include <bcm63xx_cpu.h>
-@@ -32,6 +33,8 @@
- 
- #define PFX	"board: "
- 
-+#define BCM963XX_KEYS_POLL_INTERVAL	20
-+
- static struct board_info board;
- 
- /*
-@@ -151,11 +154,23 @@ static struct platform_device bcm63xx_gp
- 	.dev.platform_data	= &bcm63xx_led_data,
- };
- 
-+static struct gpio_keys_platform_data bcm63xx_gpio_keys_data = {
-+	.poll_interval  = BCM963XX_KEYS_POLL_INTERVAL,
-+};
-+
-+static struct platform_device bcm63xx_gpio_keys_device = {
-+	.name		= "gpio-keys-polled",
-+	.id		= 0,
-+	.dev.platform_data = &bcm63xx_gpio_keys_data,
-+};
-+
- /*
-  * third stage init callback, register all board devices.
-  */
- int __init board_register_devices(void)
- {
-+	int button_count = 0;
-+
- 	if (board.has_uart0)
- 		bcm63xx_uart_register(0);
- 
-@@ -217,5 +232,16 @@ int __init board_register_devices(void)
- 		gpio_request_one(board.ephy_reset_gpio,
- 				board.ephy_reset_gpio_flags, "ephy-reset");
- 
-+	/* count number of BUTTONs defined by this device */
-+	while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
-+		button_count++;
-+
-+	if (button_count) {
-+		bcm63xx_gpio_keys_data.nbuttons = button_count;
-+		bcm63xx_gpio_keys_data.buttons = board.buttons;
-+
-+		platform_device_register(&bcm63xx_gpio_keys_device);
-+	}
-+
- 	return 0;
- }
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -3,6 +3,7 @@
- 
- #include <linux/types.h>
- #include <linux/gpio.h>
-+#include <linux/gpio_keys.h>
- #include <linux/leds.h>
- #include <bcm63xx_dev_enet.h>
- #include <bcm63xx_dev_usb_usbd.h>
-@@ -48,6 +49,9 @@ struct board_info {
- 	/* GPIO LEDs */
- 	struct gpio_led leds[5];
- 
-+	/* Buttons */
-+	struct gpio_keys_button buttons[4];
-+
- 	/* External PHY reset GPIO */
- 	unsigned int ephy_reset_gpio;
-