V4L/DVB: v4l2: sort chip IDs in v4l2-chip-ident.h

This list should stay sorted to make it easy to find new ID ranges when
adding new chip families.

[mchehab@redhat.com: fixed bad whitespacing]
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 62 insertions, 58 deletions

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 56abf21dd786..bf937d3c6ba9 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -25,6 +25,10 @@
 #define V4L2_CHIP_IDENT_H_
 
 /* VIDIOC_DBG_G_CHIP_IDENT: identifies the actual chip installed on the board */
+
+/* KEEP THIS LIST ORDERED BY ID!
+   Otherwise it will be hard to see which ranges are already in use when
+   adding support to a new chip family. */
 enum {
         /* general idents: reserved range 0-49 */
         V4L2_IDENT_NONE      = 0,       /* No chip matched */
@@ -77,17 +81,14 @@ enum {
         V4L2_IDENT_CX23417 = 417,
         V4L2_IDENT_CX23418 = 418,
 
-        /* module au0828 */
-        V4L2_IDENT_AU0828 = 828,
-
-        /* module indycam: just ident 2000 */
-        V4L2_IDENT_INDYCAM = 2000,
-
         /* module bt819: reserved range 810-819 */
         V4L2_IDENT_BT815A = 815,
         V4L2_IDENT_BT817A = 817,
         V4L2_IDENT_BT819A = 819,
 
+        /* module au0828 */
+        V4L2_IDENT_AU0828 = 828,
+
         /* module bt856: just ident 856 */
         V4L2_IDENT_BT856 = 856,
 
@@ -99,6 +100,9 @@ enum {
         V4L2_IDENT_KS0127  = 1127,
         V4L2_IDENT_KS0127B = 1128,
 
+        /* module indycam: just ident 2000 */
+        V4L2_IDENT_INDYCAM = 2000,
+
         /* module vp27smpx: just ident 2700 */
         V4L2_IDENT_VP27SMPX = 2700,
 
@@ -162,21 +166,18 @@ enum {
         /* module saa7706h: just ident 7706 */
         V4L2_IDENT_SAA7706H = 7706,
 
+        /* module mt9v011, just ident 8243 */
+        V4L2_IDENT_MT9V011 = 8243,
+
         /* module wm8739: just ident 8739 */
         V4L2_IDENT_WM8739 = 8739,
 
         /* module wm8775: just ident 8775 */
         V4L2_IDENT_WM8775 = 8775,
 
-        /* module tda9840: just ident 9840 */
-        V4L2_IDENT_TDA9840 = 9840,
-
         /* module cafe_ccic, just ident 8801 */
         V4L2_IDENT_CAFE = 8801,
 
-        /* module mt9v011, just ident 8243 */
-        V4L2_IDENT_MT9V011 = 8243,
-
         /* module cx23885 and cx25840 */
         V4L2_IDENT_CX23885    = 8850,
         V4L2_IDENT_CX23885_AV = 8851, /* Integrated A/V decoder */
@@ -186,6 +187,9 @@ enum {
         V4L2_IDENT_CX23888_AV = 8881, /* Integrated A/V decoder */
         V4L2_IDENT_CX23888_IR = 8882, /* Integrated infrared controller */
 
+        /* module tda9840: just ident 9840 */
+        V4L2_IDENT_TDA9840 = 9840,
+
         /* module tw9910: just ident 9910 */
         V4L2_IDENT_TW9910 = 9910,
 
@@ -198,72 +202,70 @@ enum {
         V4L2_IDENT_CX23101    = 23101,
         V4L2_IDENT_CX23102    = 23102,
 
-        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
+        /* module msp3400: reserved range 34000-34999 for msp34xx */
         V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
                                         use internally (tveeprom.c). */
 
         V4L2_IDENT_MSP3400B = 34002,
-        V4L2_IDENT_MSP3410B = 34102,
-
         V4L2_IDENT_MSP3400C = 34003,
-        V4L2_IDENT_MSP3410C = 34103,
-
         V4L2_IDENT_MSP3400D = 34004,
-        V4L2_IDENT_MSP3410D = 34104,
+        V4L2_IDENT_MSP3400G = 34007,
+        V4L2_IDENT_MSP3401G = 34017,
+        V4L2_IDENT_MSP3402G = 34027,
         V4L2_IDENT_MSP3405D = 34054,
-        V4L2_IDENT_MSP3415D = 34154,
+        V4L2_IDENT_MSP3405G = 34057,
         V4L2_IDENT_MSP3407D = 34074,
-        V4L2_IDENT_MSP3417D = 34174,
+        V4L2_IDENT_MSP3407G = 34077,
 
-        V4L2_IDENT_MSP3400G = 34007,
+        V4L2_IDENT_MSP3410B = 34102,
+        V4L2_IDENT_MSP3410C = 34103,
+        V4L2_IDENT_MSP3410D = 34104,
         V4L2_IDENT_MSP3410G = 34107,
-        V4L2_IDENT_MSP3420G = 34207,
-        V4L2_IDENT_MSP3430G = 34307,
-        V4L2_IDENT_MSP3440G = 34407,
-        V4L2_IDENT_MSP3450G = 34507,
-        V4L2_IDENT_MSP3460G = 34607,
-
-        V4L2_IDENT_MSP3401G = 34017,
         V4L2_IDENT_MSP3411G = 34117,
-        V4L2_IDENT_MSP3421G = 34217,
-        V4L2_IDENT_MSP3431G = 34317,
-        V4L2_IDENT_MSP3441G = 34417,
-        V4L2_IDENT_MSP3451G = 34517,
-        V4L2_IDENT_MSP3461G = 34617,
-
-        V4L2_IDENT_MSP3402G = 34027,
         V4L2_IDENT_MSP3412G = 34127,
-        V4L2_IDENT_MSP3422G = 34227,
-        V4L2_IDENT_MSP3442G = 34427,
-        V4L2_IDENT_MSP3452G = 34527,
-
-        V4L2_IDENT_MSP3405G = 34057,
+        V4L2_IDENT_MSP3415D = 34154,
         V4L2_IDENT_MSP3415G = 34157,
-        V4L2_IDENT_MSP3425G = 34257,
-        V4L2_IDENT_MSP3435G = 34357,
-        V4L2_IDENT_MSP3445G = 34457,
-        V4L2_IDENT_MSP3455G = 34557,
-        V4L2_IDENT_MSP3465G = 34657,
-
-        V4L2_IDENT_MSP3407G = 34077,
+        V4L2_IDENT_MSP3417D = 34174,
         V4L2_IDENT_MSP3417G = 34177,
+
+        V4L2_IDENT_MSP3420G = 34207,
+        V4L2_IDENT_MSP3421G = 34217,
+        V4L2_IDENT_MSP3422G = 34227,
+        V4L2_IDENT_MSP3425G = 34257,
         V4L2_IDENT_MSP3427G = 34277,
+
+        V4L2_IDENT_MSP3430G = 34307,
+        V4L2_IDENT_MSP3431G = 34317,
+        V4L2_IDENT_MSP3435G = 34357,
         V4L2_IDENT_MSP3437G = 34377,
+
+        V4L2_IDENT_MSP3440G = 34407,
+        V4L2_IDENT_MSP3441G = 34417,
+        V4L2_IDENT_MSP3442G = 34427,
+        V4L2_IDENT_MSP3445G = 34457,
         V4L2_IDENT_MSP3447G = 34477,
+
+        V4L2_IDENT_MSP3450G = 34507,
+        V4L2_IDENT_MSP3451G = 34517,
+        V4L2_IDENT_MSP3452G = 34527,
+        V4L2_IDENT_MSP3455G = 34557,
         V4L2_IDENT_MSP3457G = 34577,
+
+        V4L2_IDENT_MSP3460G = 34607,
+        V4L2_IDENT_MSP3461G = 34617,
+        V4L2_IDENT_MSP3465G = 34657,
         V4L2_IDENT_MSP3467G = 34677,
 
-        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
+        /* module msp3400: reserved range 44000-44999 for msp44xx */
         V4L2_IDENT_MSP4400G = 44007,
-        V4L2_IDENT_MSP4410G = 44107,
-        V4L2_IDENT_MSP4420G = 44207,
-        V4L2_IDENT_MSP4440G = 44407,
-        V4L2_IDENT_MSP4450G = 44507,
-
         V4L2_IDENT_MSP4408G = 44087,
+        V4L2_IDENT_MSP4410G = 44107,
         V4L2_IDENT_MSP4418G = 44187,
+        V4L2_IDENT_MSP4420G = 44207,
         V4L2_IDENT_MSP4428G = 44287,
+        V4L2_IDENT_MSP4440G = 44407,
         V4L2_IDENT_MSP4448G = 44487,
+        V4L2_IDENT_MSP4450G = 44507,
         V4L2_IDENT_MSP4458G = 44587,
 
         /* Micron CMOS sensor chips: 45000-45099 */
@@ -282,6 +284,12 @@ enum {
         /* HV7131R CMOS sensor: just ident 46000 */
         V4L2_IDENT_HV7131R              = 46000,
 
+        /* Sharp RJ54N1CB0C, 0xCB0C = 51980 */
+        V4L2_IDENT_RJ54N1CB0C = 51980,
+
+        /* module m52790: just ident 52790 */
+        V4L2_IDENT_M52790 = 52790,
+
         /* module cs53132a: just ident 53132 */
         V4L2_IDENT_CS53l32A = 53132,
 
@@ -291,11 +299,7 @@ enum {
         /* module upd64083: just ident 64083 */
         V4L2_IDENT_UPD64083 = 64083,
 
-        /* module m52790: just ident 52790 */
-        V4L2_IDENT_M52790 = 52790,
-
-        /* Sharp RJ54N1CB0C, 0xCB0C = 51980 */
-        V4L2_IDENT_RJ54N1CB0C = 51980,
+        /* Don't just add new IDs at the end: KEEP THIS LIST ORDERED BY ID! */
 };
 
 #endif