From: Dmitry Torokhov Date: Mon, 23 Mar 2015 16:18:27 +0000 (-0700) Subject: Merge tag 'v4.0-rc5' into next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=188933ac139a6f8ab06cad369bd0200af947b00d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'v4.0-rc5' into next Merge with the latest upstream to synchronize Synaptics changes and bring in new infrastructure pieces. Conflicts: drivers/input/mouse/synaptics.c --- 188933ac139a6f8ab06cad369bd0200af947b00d diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt index 943ed01f9fe5,fae26d014aaf..c862cf94c9c8 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@@ -63,9 -75,9 +75,10 @@@ fsl Freescale Semiconducto GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. geniatech Geniatech, Inc. + giantplus Giantplus Technology Co., Ltd. globalscale Globalscale Technologies, Inc. gmt Global Mixed-mode Technology, Inc. +goodix Shenzhen Huiding Technology Co., Ltd. google Google, Inc. gumstix Gumstix, Inc. gw Gateworks Corporation diff --cc drivers/input/mouse/synaptics.c index 4c69e3304011,dda605836546..d73a94270211 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@@ -612,6 -670,20 +677,18 @@@ static void synaptics_parse_agm(const u } } + static void synaptics_parse_ext_buttons(const unsigned char buf[], + struct synaptics_data *priv, + struct synaptics_hw_state *hw) + { + unsigned int ext_bits = + (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1; + unsigned int ext_mask = GENMASK(ext_bits - 1, 0); + + hw->ext_buttons = buf[4] & ext_mask; + hw->ext_buttons |= (buf[5] & ext_mask) << ext_bits; + } + -static bool is_forcepad; - static int synaptics_parse_hw_state(const unsigned char buf[], struct synaptics_data *priv, struct synaptics_hw_state *hw)