[media] em28xx: extend the support for device buttons

The current code supports only a single snapshot button assigned to
register 0x0c bit 5. But devices may be equipped with multiple buttons
with different functionalities and they can also be assigned to the
various GPI-ports.
Extend the em28xx-input code to handle multiple buttons assigned to different
GPI-ports / register addresses and bits.
Also make easier to extend the code with further button types.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

1 files changed, 17 insertions, 3 deletions

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index a5196697627f..ebb112c17109 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -413,6 +413,20 @@ static struct em28xx_reg_seq pctv_520e[] = {
 };
 
 /*
+ *  Button definitions
+ */
+static struct em28xx_button std_snapshot_button[] = {
+        {
+                .role         = EM28XX_BUTTON_SNAPSHOT,
+                .reg_r        = EM28XX_R0C_USBSUSP,
+                .reg_clearing = EM28XX_R0C_USBSUSP,
+                .mask         = EM28XX_R0C_USBSUSP_SNAPSHOT,
+                .inverted     = 0,
+        },
+        {-1, 0, 0, 0, 0},
+};
+
+/*
  *  Board definitions
  */
 struct em28xx_board em28xx_boards[] = {
@@ -1391,7 +1405,7 @@ struct em28xx_board em28xx_boards[] = {
         },
         [EM2820_BOARD_PROLINK_PLAYTV_USB2] = {
                 .name         = "SIIG AVTuner-PVR / Pixelview Prolink PlayTV USB 2.0",
-                .has_snapshot_button = 1,
+                .buttons = std_snapshot_button,
                 .tda9887_conf = TDA9887_PRESENT,
                 .tuner_type   = TUNER_YMEC_TVF_5533MF,
                 .decoder      = EM28XX_SAA711X,
@@ -1413,7 +1427,7 @@ struct em28xx_board em28xx_boards[] = {
         },
         [EM2860_BOARD_SAA711X_REFERENCE_DESIGN] = {
                 .name                = "EM2860/SAA711X Reference Design",
-                .has_snapshot_button = 1,
+                .buttons = std_snapshot_button,
                 .tuner_type          = TUNER_ABSENT,
                 .decoder             = EM28XX_SAA711X,
                 .input               = { {
@@ -2841,7 +2855,7 @@ static void request_module_async(struct work_struct *work)
 
         if (dev->board.has_dvb)
                 request_module("em28xx-dvb");
-        if (dev->board.has_snapshot_button ||
+        if (dev->board.buttons ||
             ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir))
                 request_module("em28xx-rc");
 #endif /* CONFIG_MODULES */