Merge branches 'for-4.10/upstream-fixes', 'for-4.11/intel-ish', 'for-4.11/mayflash...

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
index 8943a58,ec277b9,23cb33c,fd4ba3a,e82dccc,ec277b9,f46f2c5..86c95d3
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/drivers/hid/hid-ids.h
--- 4/drivers/hid/hid-ids.h
--- 5/drivers/hid/hid-ids.h
--- 6/drivers/hid/hid-ids.h
--- 7/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@@@@@@ -322,8 -319,7 -319,9 -319,7 -319,8 -319,7 -319,8 +322,9 @@@@@@@@
       #define USB_VENDOR_ID_DRAGONRISE         0x0079
       #define USB_DEVICE_ID_DRAGONRISE_WIIU            0x1800
       #define USB_DEVICE_ID_DRAGONRISE_PS3             0x1801
 - - - #define USB_DEVICE_ID_DRAGONRISE_GAMECUBE        0x1843
 + + + #define USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR      0x1803
-   - -#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE        0x1843
++ ++++#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE1       0x1843
++ ++++#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE2       0x1844
       
       #define USB_VENDOR_ID_DWAV               0x0eef
       #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER     0x0001

diff --cc drivers/hid/intel-ish-hid/ipc/pci-ish.c
Simple merge

diff --cc drivers/hid/usbhid/hid-quirks.c
index 30a2977,b3e01c8,54b641e,f3c5939,e9d6cc7,b3e01c8,e9d6cc7..d6847a6
--- 1/drivers/hid/usbhid/hid-quirks.c
--- 2/drivers/hid/usbhid/hid-quirks.c
--- 3/drivers/hid/usbhid/hid-quirks.c
--- 4/drivers/hid/usbhid/hid-quirks.c
--- 5/drivers/hid/usbhid/hid-quirks.c
--- 6/drivers/hid/usbhid/hid-quirks.c
--- 7/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@@@@@@ -84,8 -83,7 -83,8 -83,7 -83,8 -83,7 -83,8 +84,8 @@@@@@@@ static const struct hid_blacklist 
        { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3, HID_QUIRK_MULTI_INPUT },
 - - -  { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE, HID_QUIRK_MULTI_INPUT },
 + + +  { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR, HID_QUIRK_MULTI_INPUT },
-   - - { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE, HID_QUIRK_MULTI_INPUT },
++ ++++ { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },
        { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },

diff --cc drivers/hid/wacom.h
Simple merge

diff --cc drivers/hid/wacom_sys.c
Simple merge

diff --cc drivers/hid/wacom_wac.c
index 672145b,b1a9a3c,b1a9a3c,b1a9a3c,b1a9a3c,b1a9a3c,1f3bdd1..4aa3de9
--- 1/drivers/hid/wacom_wac.c
--- 2/drivers/hid/wacom_wac.c
--- 3/drivers/hid/wacom_wac.c
--- 4/drivers/hid/wacom_wac.c
--- 5/drivers/hid/wacom_wac.c
--- 6/drivers/hid/wacom_wac.c
--- 7/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@@@@@@ -166,21 -166,19 -166,19 -166,19 -166,19 -166,19 -168,19 +168,21 @@@@@@@@ static int wacom_pl_irq(struct wacom_wa
                wacom->id[0] = STYLUS_DEVICE_ID;
        }
       
 ------ pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));
 ------ if (features->pressure_max > 255)
 ------         pressure = (pressure << 1) | ((data[4] >> 6) & 1);
 ------ pressure += (features->pressure_max + 1) / 2;
      -
      - input_report_abs(input, ABS_X, data[3] | (data[2] << 7) | ((data[1] & 0x03) << 14));
      - input_report_abs(input, ABS_Y, data[6] | (data[5] << 7) | ((data[4] & 0x03) << 14));
      - input_report_abs(input, ABS_PRESSURE, pressure);
      -
      - input_report_key(input, BTN_TOUCH, data[4] & 0x08);
      - input_report_key(input, BTN_STYLUS, data[4] & 0x10);
      - /* Only allow the stylus2 button to be reported for the pen tool. */
      - input_report_key(input, BTN_STYLUS2, (wacom->tool[0] == BTN_TOOL_PEN) && (data[4] & 0x20));
 ++++++ if (prox) {
 ++++++         pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));
 ++++++         if (features->pressure_max > 255)
 ++++++                 pressure = (pressure << 1) | ((data[4] >> 6) & 1);
 ++++++         pressure += (features->pressure_max + 1) / 2;
      +
 -----  input_report_abs(input, ABS_X, data[3] | (data[2] << 7) | ((data[1] & 0x03) << 14));
 -----  input_report_abs(input, ABS_Y, data[6] | (data[5] << 7) | ((data[4] & 0x03) << 14));
 -----  input_report_abs(input, ABS_PRESSURE, pressure);
 ++++++         input_report_abs(input, ABS_X, data[3] | (data[2] << 7) | ((data[1] & 0x03) << 14));
 ++++++         input_report_abs(input, ABS_Y, data[6] | (data[5] << 7) | ((data[4] & 0x03) << 14));
 ++++++         input_report_abs(input, ABS_PRESSURE, pressure);
      +
 -----  input_report_key(input, BTN_TOUCH, data[4] & 0x08);
 -----  input_report_key(input, BTN_STYLUS, data[4] & 0x10);
 -----  /* Only allow the stylus2 button to be reported for the pen tool. */
 -----  input_report_key(input, BTN_STYLUS2, (wacom->tool[0] == BTN_TOOL_PEN) && (data[4] & 0x20));
 ++++++         input_report_key(input, BTN_TOUCH, data[4] & 0x08);
 ++++++         input_report_key(input, BTN_STYLUS, data[4] & 0x10);
 ++++++         /* Only allow the stylus2 button to be reported for the pen tool. */
 ++++++         input_report_key(input, BTN_STYLUS2, (wacom->tool[0] == BTN_TOOL_PEN) && (data[4] & 0x20));
 ++++++ }
       
        if (!prox)
                wacom->id[0] = 0;
@@@@@@@@ -1629,10 -1627,10 -1627,10 -1627,10 -1627,10 -1627,10 -1824,24 +1826,24 @@@@@@@@ static void wacom_wac_pad_event(struct 
       
        switch (equivalent_usage) {
        case WACOM_HID_WD_TOUCHRINGSTATUS:
++++++          if (!value)
++++++                  input_event(input, usage->type, usage->code, 0);
 +++++          break;
 +++++ 
++++++  case WACOM_HID_WD_TOUCHONOFF:
++++++          if (wacom_wac->shared->touch_input) {
++++++                  input_report_switch(wacom_wac->shared->touch_input,
++++++                                      SW_MUTE_DEVICE, !value);
++++++                  input_sync(wacom_wac->shared->touch_input);
++++++          }
+               break;
+      
++++++  case WACOM_HID_WD_BUTTONCENTER:
++++++          for (i = 0; i < wacom->led.count; i++)
++++++                  wacom_update_led(wacom, features->numbered_buttons,
++++++                                   value, i);
++++++           /* fall through*/
        default:
------          features->input_event_flag = true;
                input_event(input, usage->type, usage->code, value);
                break;
        }