aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-01-03 03:55:30 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-01-24 16:39:53 -0500
commit4d6dc7fdef2971f8158cd05f3d1b44f9ddc437e3 (patch)
tree38c7f1e0d9b7251b78a3d259a204ae82c6458384
parente7277e1dcc8c332a1d69f4c585e593bcbc9c5970 (diff)
MIPS: BCM47XX: Enable buttons support on SSB
This is supported since implementing IRQ domain in ssb. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/6315/
-rw-r--r--arch/mips/bcm47xx/buttons.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 51815bae3633..872c62e93e0e 100644
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -3,7 +3,6 @@
3#include <linux/input.h> 3#include <linux/input.h>
4#include <linux/gpio_keys.h> 4#include <linux/gpio_keys.h>
5#include <linux/interrupt.h> 5#include <linux/interrupt.h>
6#include <linux/ssb/ssb_embedded.h>
7#include <bcm47xx_board.h> 6#include <bcm47xx_board.h>
8#include <bcm47xx.h> 7#include <bcm47xx.h>
9 8
@@ -359,13 +358,6 @@ int __init bcm47xx_buttons_register(void)
359 enum bcm47xx_board board = bcm47xx_board_get(); 358 enum bcm47xx_board board = bcm47xx_board_get();
360 int err; 359 int err;
361 360
362#ifdef CONFIG_BCM47XX_SSB
363 if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_SSB) {
364 pr_debug("Buttons on SSB are not supported yet.\n");
365 return -ENOTSUPP;
366 }
367#endif
368
369 switch (board) { 361 switch (board) {
370 case BCM47XX_BOARD_ASUS_RTN12: 362 case BCM47XX_BOARD_ASUS_RTN12:
371 err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12); 363 err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);