Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
1  2  3  4 
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/usbhid/hid-quirks.c

diff --combined drivers/hid/hid-ids.h
index 63552e30d0c38986308ad2a385bccd8ab6bb9218,b8574cddd95352a360ef7ff67200527185b3c1fb,b8574cddd95352a360ef7ff67200527185b3c1fb,e0bac4ff04fb4a5d5b46d1a15e6702a464ac4def..55360fefee5bea506dcff90032850155acc06428
    #define USB_VENDOR_ID_ACTIONSTAR    0x2101
    #define USB_DEVICE_ID_ACTIONSTAR_1011       0x1011
    
--- #define USB_VENDOR_ID_ADS_TECH              0x06e1
+++ #define USB_VENDOR_ID_ADS_TECH              0x06e1
    #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155
    
    #define USB_VENDOR_ID_AFATECH               0x15a4
    #define USB_VENDOR_ID_AIRCABLE              0x16CA
    #define USB_DEVICE_ID_AIRCABLE1             0x1502
    
 +++#define USB_VENDOR_ID_AIREN         0x1a2c
 +++#define USB_DEVICE_ID_AIREN_SLIMPLUS        0x0002
 +++
    #define USB_VENDOR_ID_ALCOR         0x058f
    #define USB_DEVICE_ID_ALCOR_USBRS232        0x9720
    
    
    #define USB_VENDOR_ID_ATMEL         0x03eb
    #define USB_DEVICE_ID_ATMEL_MULTITOUCH      0x211c
+++ #define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER   0x2118
    
    #define USB_VENDOR_ID_AVERMEDIA             0x07ca
    #define USB_DEVICE_ID_AVER_FM_MR800 0xb800
    #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER        0x0001
    #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D   0x480d
    #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E   0x480e
+++ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207   0x7207
    #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C   0x720c
+++ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224   0x7224
+++ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A   0x722A
+++ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E   0x725e
+++ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262   0x7262
    #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B   0x726b
+++ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA   0x72aa
    #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1   0x72a1
    #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA   0x72fa
    #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302   0x7302
+++ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349   0x7349
    #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001   0xa001
    
    #define USB_VENDOR_ID_ELECOM                0x056e
    
    #define USB_VENDOR_ID_IDEACOM               0x1cb6
    #define USB_DEVICE_ID_IDEACOM_IDC6650       0x6650
+++ #define USB_DEVICE_ID_IDEACOM_IDC6651       0x6651
    
    #define USB_VENDOR_ID_ILITEK                0x222a
    #define USB_DEVICE_ID_ILITEK_MULTITOUCH     0x0001
    #define USB_DEVICE_ID_ORTEK_PKB1700 0x1700
    #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000
    
+++ #define USB_VENDOR_ID_PANASONIC             0x04da
+++ #define USB_DEVICE_ID_PANABOARD_UBT780      0x1044
+++ #define USB_DEVICE_ID_PANABOARD_UBT880      0x104d
+++ 
    #define USB_VENDOR_ID_PANJIT                0x134c
    
    #define USB_VENDOR_ID_PANTHERLORD   0x0810
    
    #define USB_VENDOR_ID_TOPSEED2              0x1784
    #define USB_DEVICE_ID_TOPSEED2_RF_COMBO     0x0004
+++ #define USB_DEVICE_ID_TOPSEED2_PERIPAD_701  0x0016
    
    #define USB_VENDOR_ID_TOPMAX                0x0663
    #define USB_DEVICE_ID_TOPMAX_COBRAPAD       0x0103
diff --combined drivers/hid/hid-input.c
index 627850a54d34ecd6da97f281324b1eff98a368fc,af0200f061c0d95388f86860a348dcf7ec38a0e9,9333d692a786b03df115ebe87d920e748b607dc6,9333d692a786b03df115ebe87d920e748b607dc6..002781c5a6164040e90a6a5bab40ed982e50b508
@@@@@ -279,7 -279,8 -279,7 -279,7 +279,8 @@@@@ static enum power_supply_property hidin
        POWER_SUPPLY_PROP_ONLINE,
        POWER_SUPPLY_PROP_CAPACITY,
        POWER_SUPPLY_PROP_MODEL_NAME,
- --    POWER_SUPPLY_PROP_STATUS
+ ++    POWER_SUPPLY_PROP_STATUS,
+ ++    POWER_SUPPLY_PROP_SCOPE,
    };
    
    #define HID_BATTERY_QUIRK_PERCENT   (1 << 0) /* always reports percent */
@@@@@ -344,6 -345,10 -344,6 -344,6 +345,10 @@@@@ static int hidinput_get_battery_propert
                val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
                break;
    
+ ++    case POWER_SUPPLY_PROP_SCOPE:
+ ++            val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+ ++            break;
+ ++
        default:
                ret = -EINVAL;
                break;
@@@@@ -403,6 -408,8 -403,6 -403,6 +408,8 @@@@@ static bool hidinput_setup_battery(stru
                battery->name = NULL;
        }
    
+ ++    power_supply_powers(battery, &dev->dev);
+ ++
    out:
        return true;
    }
@@@@@ -986,13 -993,8 -986,8 -986,8 +993,13 @@@@@ void hidinput_hid_event(struct hid_devi
                return;
        }
    
 ---    /* Ignore out-of-range values as per HID specification, section 5.10 */
 ---    if (value < field->logical_minimum || value > field->logical_maximum) {
 +++    /*
 +++     * Ignore out-of-range values as per HID specification,
 +++     * section 5.10 and 6.2.25
 +++     */
 +++    if ((field->flags & HID_MAIN_ITEM_VARIABLE) &&
 +++        (value < field->logical_minimum ||
 +++         value > field->logical_maximum)) {
                dbg_hid("Ignoring out-of-range value %x\n", value);
                return;
        }
index 57d4e1e1df48df061461681449f5e98f49c20a1e,c831af937481c66123965743f62aaf5f8a634b3c,c831af937481c66123965743f62aaf5f8a634b3c,4d248d5d3783d791513e1b13377976d607f3f7eb..0dd0bebac69fbf9c553754c5f8da428aa700b5d3
@@@@@ -54,7 -54,6 -54,6 -54,6 +54,7 @@@@@ static const struct hid_blacklist 
        { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT },
    
 +++    { USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
+++     { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },