1 files changed, 90 insertions, 1 deletions

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index af02139b0b93..ed2f008f8403 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -248,6 +248,88 @@ static __u8 motion_rdesc[] = {
         0xC0                /*  End Collection                      */
 };
 
+/* PS/3 Navigation controller */
+static __u8 navigation_rdesc[] = {
+        0x05, 0x01,         /*  Usage Page (Desktop),               */
+        0x09, 0x04,         /*  Usage (Joystik),                    */
+        0xA1, 0x01,         /*  Collection (Application),           */
+        0xA1, 0x02,         /*      Collection (Logical),           */
+        0x85, 0x01,         /*          Report ID (1),              */
+        0x75, 0x08,         /*          Report Size (8),            */
+        0x95, 0x01,         /*          Report Count (1),           */
+        0x15, 0x00,         /*          Logical Minimum (0),        */
+        0x26, 0xFF, 0x00,   /*          Logical Maximum (255),      */
+        0x81, 0x03,         /*          Input (Constant, Variable), */
+        0x75, 0x01,         /*          Report Size (1),            */
+        0x95, 0x13,         /*          Report Count (19),          */
+        0x15, 0x00,         /*          Logical Minimum (0),        */
+        0x25, 0x01,         /*          Logical Maximum (1),        */
+        0x35, 0x00,         /*          Physical Minimum (0),       */
+        0x45, 0x01,         /*          Physical Maximum (1),       */
+        0x05, 0x09,         /*          Usage Page (Button),        */
+        0x19, 0x01,         /*          Usage Minimum (01h),        */
+        0x29, 0x13,         /*          Usage Maximum (13h),        */
+        0x81, 0x02,         /*          Input (Variable),           */
+        0x75, 0x01,         /*          Report Size (1),            */
+        0x95, 0x0D,         /*          Report Count (13),          */
+        0x06, 0x00, 0xFF,   /*          Usage Page (FF00h),         */
+        0x81, 0x03,         /*          Input (Constant, Variable), */
+        0x15, 0x00,         /*          Logical Minimum (0),        */
+        0x26, 0xFF, 0x00,   /*          Logical Maximum (255),      */
+        0x05, 0x01,         /*          Usage Page (Desktop),       */
+        0x09, 0x01,         /*          Usage (Pointer),            */
+        0xA1, 0x00,         /*          Collection (Physical),      */
+        0x75, 0x08,         /*              Report Size (8),        */
+        0x95, 0x02,         /*              Report Count (2),       */
+        0x35, 0x00,         /*              Physical Minimum (0),   */
+        0x46, 0xFF, 0x00,   /*              Physical Maximum (255), */
+        0x09, 0x30,         /*              Usage (X),              */
+        0x09, 0x31,         /*              Usage (Y),              */
+        0x81, 0x02,         /*              Input (Variable),       */
+        0xC0,               /*          End Collection,             */
+        0x06, 0x00, 0xFF,   /*          Usage Page (FF00h),         */
+        0x95, 0x06,         /*          Report Count (6),           */
+        0x81, 0x03,         /*          Input (Constant, Variable), */
+        0x05, 0x01,         /*          Usage Page (Desktop),       */
+        0x75, 0x08,         /*          Report Size (8),            */
+        0x95, 0x05,         /*          Report Count (5),           */
+        0x09, 0x01,         /*          Usage (Pointer),            */
+        0x81, 0x02,         /*          Input (Variable),           */
+        0x06, 0x00, 0xFF,   /*          Usage Page (FF00h),         */
+        0x95, 0x20,         /*          Report Count (26),          */
+        0x81, 0x02,         /*          Input (Variable),           */
+        0x75, 0x08,         /*          Report Size (8),            */
+        0x95, 0x30,         /*          Report Count (48),          */
+        0x09, 0x01,         /*          Usage (Pointer),            */
+        0x91, 0x02,         /*          Output (Variable),          */
+        0x75, 0x08,         /*          Report Size (8),            */
+        0x95, 0x30,         /*          Report Count (48),          */
+        0x09, 0x01,         /*          Usage (Pointer),            */
+        0xB1, 0x02,         /*          Feature (Variable),         */
+        0xC0,               /*      End Collection,                 */
+        0xA1, 0x02,         /*      Collection (Logical),           */
+        0x85, 0x02,         /*          Report ID (2),              */
+        0x75, 0x08,         /*          Report Size (8),            */
+        0x95, 0x30,         /*          Report Count (48),          */
+        0x09, 0x01,         /*          Usage (Pointer),            */
+        0xB1, 0x02,         /*          Feature (Variable),         */
+        0xC0,               /*      End Collection,                 */
+        0xA1, 0x02,         /*      Collection (Logical),           */
+        0x85, 0xEE,         /*          Report ID (238),            */
+        0x75, 0x08,         /*          Report Size (8),            */
+        0x95, 0x30,         /*          Report Count (48),          */
+        0x09, 0x01,         /*          Usage (Pointer),            */
+        0xB1, 0x02,         /*          Feature (Variable),         */
+        0xC0,               /*      End Collection,                 */
+        0xA1, 0x02,         /*      Collection (Logical),           */
+        0x85, 0xEF,         /*          Report ID (239),            */
+        0x75, 0x08,         /*          Report Size (8),            */
+        0x95, 0x30,         /*          Report Count (48),          */
+        0x09, 0x01,         /*          Usage (Pointer),            */
+        0xB1, 0x02,         /*          Feature (Variable),         */
+        0xC0,               /*      End Collection,                 */
+        0xC0                /*  End Collection                      */
+};
 
 /*
  * The default descriptor doesn't provide mapping for the accelerometers
@@ -974,6 +1056,13 @@ static u8 *motion_fixup(struct hid_device *hdev, u8 *rdesc,
         return motion_rdesc;
 }
 
+static u8 *navigation_fixup(struct hid_device *hdev, u8 *rdesc,
+                             unsigned int *rsize)
+{
+        *rsize = sizeof(navigation_rdesc);
+        return navigation_rdesc;
+}
+
 static __u8 *ps3remote_fixup(struct hid_device *hdev, __u8 *rdesc,
                              unsigned int *rsize)
 {
@@ -1058,7 +1147,7 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                 return motion_fixup(hdev, rdesc, rsize);
 
         if (sc->quirks & NAVIGATION_CONTROLLER)
-                return sixaxis_fixup(hdev, rdesc, rsize);
+                return navigation_fixup(hdev, rdesc, rsize);
 
         if (sc->quirks & PS3REMOTE)
                 return ps3remote_fixup(hdev, rdesc, rsize);