Merge branch 'for-4.18/hid-steam' into for-linus

Valve Steam Controller support from Rodrigo Rivas Costa

diff --combined drivers/hid/Kconfig
index dbaa1939a3e90b94bc181873d6be568e368bb3ce,c75b12ded7afe5bbde7e6b091572f9860a8edf41..a49a10437c4068989fb085174ed8923cbf0f04c4
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -575,13 -575,6 +575,13 @@@ config HID_MAYFLAS
        Say Y here if you have HJZ Mayflash PS3 game controller adapters
        and want to enable force feedback support.
  
 +config HID_REDRAGON
 +      tristate "Redragon keyboards"
 +      depends on HID
 +      default !EXPERT
 +      ---help---
 +    Support for Redragon keyboards that need fix-ups to work properly.
 +
  config HID_MICROSOFT
        tristate "Microsoft non-fully HID-compliant devices"
        depends on HID
@@@ -845,6 -838,15 +845,15 @@@ config HID_SPEEDLIN
        ---help---
        Support for Speedlink Vicious and Divine Cezanne mouse.
  
+ config HID_STEAM
+       tristate "Steam Controller support"
+       depends on HID
+       select POWER_SUPPLY
+       ---help---
+       Say Y here if you have a Steam Controller if you want to use it
+       without running the Steam Client. It supports both the wired and
+       the wireless adaptor.
+ 
  config HID_STEELSERIES
        tristate "Steelseries SRW-S1 steering wheel support"
        depends on HID

diff --combined drivers/hid/Makefile
index 3283c79b50a885341116e4e5bf3d48908eadbb3d,b646e67abc5fd306f556aa759aec084310986910..511e1cbff768580fbbcefa36b73b81486e267a9d
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -86,7 -86,6 +86,7 @@@ hid-picolcd-$(CONFIG_DEBUG_FS)                += hid-
  
  obj-$(CONFIG_HID_PLANTRONICS) += hid-plantronics.o
  obj-$(CONFIG_HID_PRIMAX)      += hid-primax.o
 +obj-$(CONFIG_HID_REDRAGON)    += hid-redragon.o
  obj-$(CONFIG_HID_RETRODE)     += hid-retrode.o
  obj-$(CONFIG_HID_ROCCAT)      += hid-roccat.o hid-roccat-common.o \
        hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
@@@ -98,6 -97,7 +98,7 @@@ obj-$(CONFIG_HID_SAMSUNG)     += hid-samsun
  obj-$(CONFIG_HID_SMARTJOYPLUS)        += hid-sjoy.o
  obj-$(CONFIG_HID_SONY)                += hid-sony.o
  obj-$(CONFIG_HID_SPEEDLINK)   += hid-speedlink.o
+ obj-$(CONFIG_HID_STEAM)               += hid-steam.o
  obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
  obj-$(CONFIG_HID_SUNPLUS)     += hid-sunplus.o
  obj-$(CONFIG_HID_GREENASIA)   += hid-gaff.o

diff --combined drivers/hid/hid-ids.h
index be08f988f5e428f6a6de0bdc4f66c0cee7407970,e293506be7aaae6a68c3a2323f554eb461e1bf95..a85634fe033f01bd6f9a2b41c67d027c0b55ccc1
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -615,7 -615,6 +615,7 @@@
  #define USB_VENDOR_ID_JESS            0x0c45
  #define USB_DEVICE_ID_JESS_YUREX      0x1010
  #define USB_DEVICE_ID_ASUS_MD_5112    0x5112
 +#define USB_DEVICE_ID_REDRAGON_ASURA  0x760b
  
  #define USB_VENDOR_ID_JESS2           0x0f30
  #define USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD 0x0111
@@@ -1013,6 -1012,10 +1013,10 @@@
  #define USB_VENDOR_ID_STANTUM_SITRONIX                0x1403
  #define USB_DEVICE_ID_MTP_SITRONIX            0x5001
  
+ #define USB_VENDOR_ID_VALVE                   0x28de
+ #define USB_DEVICE_ID_STEAM_CONTROLLER                0x1102
+ #define USB_DEVICE_ID_STEAM_CONTROLLER_WIRELESS       0x1142
+ 
  #define USB_VENDOR_ID_STEELSERIES     0x1038
  #define USB_DEVICE_ID_STEELSERIES_SRWS1       0x1410