| Message ID | 20210429103548.1.If5f9a44cb81e25b9350f7c6c0b3c88b4ecd81166@changeid (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 05665cef4b745cb46b1d1b8e96deaa25464092d3 |
| Headers | show |
| Series | Input: xpad - add support for Amazon Game Controller | expand |
On Thu, 29 Apr 2021 at 10:36, Matt Reynolds <mattreynolds@chromium.org> wrote: > > The Amazon Luna controller (product name "Amazon Game Controller") behaves > like an Xbox 360 controller when connected over USB. > > Signed-off-by: Matt Reynolds <mattreynolds@chromium.org> Reviewed-by: Harry Cutts <hcutts@chromium.org> Harry Cutts Chrome OS Touch/Input team > --- > > drivers/input/joystick/xpad.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c > index 9f0d07dcbf06..d69d7657ab12 100644 > --- a/drivers/input/joystick/xpad.c > +++ b/drivers/input/joystick/xpad.c > @@ -268,6 +268,7 @@ static const struct xpad_device { > { 0x1689, 0xfd00, "Razer Onza Tournament Edition", 0, XTYPE_XBOX360 }, > { 0x1689, 0xfd01, "Razer Onza Classic Edition", 0, XTYPE_XBOX360 }, > { 0x1689, 0xfe00, "Razer Sabertooth", 0, XTYPE_XBOX360 }, > + { 0x1949, 0x041a, "Amazon Game Controller", 0, XTYPE_XBOX360 }, > { 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 }, > { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, > { 0x1bad, 0x0130, "Ion Drum Rocker", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, > @@ -440,6 +441,7 @@ static const struct usb_device_id xpad_table[] = { > XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ > XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ > XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ > + XPAD_XBOX360_VENDOR(0x1949), /* Amazon controllers */ > XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ > XPAD_XBOX360_VENDOR(0x20d6), /* PowerA Controllers */ > XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */ > -- > 2.31.1.527.g47e6f16901-goog >
On Thu, Apr 29, 2021 at 10:36:11AM -0700, Matt Reynolds wrote: > The Amazon Luna controller (product name "Amazon Game Controller") behaves > like an Xbox 360 controller when connected over USB. > > Signed-off-by: Matt Reynolds <mattreynolds@chromium.org> Applied, thank you.
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 9f0d07dcbf06..d69d7657ab12 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -268,6 +268,7 @@ static const struct xpad_device { { 0x1689, 0xfd00, "Razer Onza Tournament Edition", 0, XTYPE_XBOX360 }, { 0x1689, 0xfd01, "Razer Onza Classic Edition", 0, XTYPE_XBOX360 }, { 0x1689, 0xfe00, "Razer Sabertooth", 0, XTYPE_XBOX360 }, + { 0x1949, 0x041a, "Amazon Game Controller", 0, XTYPE_XBOX360 }, { 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 }, { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, { 0x1bad, 0x0130, "Ion Drum Rocker", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, @@ -440,6 +441,7 @@ static const struct usb_device_id xpad_table[] = { XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ + XPAD_XBOX360_VENDOR(0x1949), /* Amazon controllers */ XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ XPAD_XBOX360_VENDOR(0x20d6), /* PowerA Controllers */ XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */
The Amazon Luna controller (product name "Amazon Game Controller") behaves like an Xbox 360 controller when connected over USB. Signed-off-by: Matt Reynolds <mattreynolds@chromium.org> --- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+)