git.openpandora.org / pandora-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
V4L/DVB (3108): tveeprom cleanup of hardcoded tuner format values.
[pandora-kernel.git] / drivers / media / video / tveeprom.c
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 72e8741..a26ce75 100644 (file)
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -63,10 +63,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
                printk(KERN_INFO "tveeprom %d-%04x: " fmt, \
                        c->adapter->nr, c->addr , ##arg); } while (0)
 
-
-/* ----------------------------------------------------------------------- */
-/* some hauppauge specific stuff                                           */
-
+/*
+ * The Hauppauge eeprom uses an 8bit field to determine which
+ * tuner formats the tuner supports.
+ */
 static struct HAUPPAUGE_TUNER_FMT
 {
        int     id;
@@ -74,14 +74,14 @@ static struct HAUPPAUGE_TUNER_FMT
 }
 hauppauge_tuner_fmt[] =
 {
-       { 0x00000000, " unknown1" },
-       { 0x00000000, " unknown2" },
-       { 0x00000007, " PAL(B/G)" },
-       { 0x00001000, " NTSC(M)" },
-       { 0x00000010, " PAL(I)" },
-       { 0x00400000, " SECAM(L/L')" },
-       { 0x00000e00, " PAL(D/K)" },
-       { 0x03000000, " ATSC Digital" },
+       { V4L2_STD_UNKNOWN," UNKNOWN" },
+       { V4L2_STD_UNKNOWN," FM" },
+       { V4L2_STD_PAL_BG, " PAL(B/G)" },
+       { V4L2_STD_NTSC_M, " NTSC(M)" },
+       { V4L2_STD_PAL_I,  " PAL(I)" },
+       { V4L2_STD_SECAM_L," SECAM(L/L')" },
+       { V4L2_STD_PAL_DK, " PAL(D/D1/K)" },
+       { V4L2_STD_ATSC,   " ATSC/DVB Digital" },
 };
 
 /* This is the full list of possible tuners. Many thanks to Hauppauge for
@@ -206,16 +206,30 @@ hauppauge_tuner[] =
        { TUNER_ABSENT,        "TCL 2002MI_3H"},
        { TUNER_TCL_2002N,     "TCL 2002N 5H"},
        /* 100-109 */
-       { TUNER_ABSENT,        "Philips FMD1216ME"},
+       { TUNER_PHILIPS_FMD1216ME_MK3, "Philips FMD1216ME"},
        { TUNER_TEA5767,       "Philips TEA5768HL FM Radio"},
        { TUNER_ABSENT,        "Panasonic ENV57H12D5"},
-       { TUNER_ABSENT,        "TCL MFNM05-4"},
+       { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"},
        { TUNER_ABSENT,        "TCL MNM05-4"},
        { TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"},
        { TUNER_ABSENT,        "TCL MQNM05-4"},
        { TUNER_ABSENT,        "LG TAPC-W701D"},
        { TUNER_ABSENT,        "TCL 9886P-WM"},
        { TUNER_ABSENT,        "TCL 1676NM-WM"},
+       /* 110-119 */
+       { TUNER_ABSENT,        "Thompson DTT75105"},
+       { TUNER_ABSENT,        "Conexant_CX24109"},
+       { TUNER_ABSENT,        "TCL M2523_5N_E"},
+       { TUNER_ABSENT,        "TCL M2523_3DB_E"},
+       { TUNER_ABSENT,        "Philips 8275A"},
+       { TUNER_ABSENT,        "Microtune MT2060"},
+       { TUNER_ABSENT,        "Philips FM1236 MK5"},
+       { TUNER_ABSENT,        "Philips FM1216ME MK5"},
+       { TUNER_ABSENT,        "TCL M2523_3DI_E"},
+       { TUNER_ABSENT,        "Samsung THPD5222FG30A"},
+       /* 120-129 */
+       { TUNER_ABSENT,        "Xceive XC3028"},
+       { TUNER_ABSENT,        "Philips FQ1216LME MK5"},
 };
 
 static struct HAUPPAUGE_AUDIOIC
@@ -325,6 +339,7 @@ static int hasRadioTuner(int tunerType)
                case 78: //PNPEnv_TUNER_TDA8275C1_8290_FM:
                case 89: //PNPEnv_TUNER_TCL_MFPE05_2:
                case 92: //PNPEnv_TUNER_PHILIPS_FQ1236A_MK4:
+               case 105:
                return 1;
        }
        return 0;
@@ -368,10 +383,15 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
        memset(tvee, 0, sizeof(*tvee));
        done = len = beenhere = 0;
 
-       /* Hack for processing eeprom for em28xx */
-       if ((eeprom_data[0]==0x1a)&&(eeprom_data[1]==0xeb)&&
-                               (eeprom_data[2]==0x67)&&(eeprom_data[3]==0x95))
-               start=0xa0;
+       /* Hack for processing eeprom for em28xx and cx 2388x*/
+       if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) &&
+                       (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95))
+               start=0xa0; /* Generic em28xx offset */
+       else if (((eeprom_data[0] & 0xf0) == 0x10) &&
+                                       (eeprom_data[1] == 0x00) &&
+                                       (eeprom_data[2] == 0x00) &&
+                                       (eeprom_data[8] == 0x84))
+               start=8; /* Generic cx2388x offset */
        else
                start=0;
 
@@ -448,6 +468,17 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                                eeprom_data[i+5] +
                                (eeprom_data[i+6] << 8) +
                                (eeprom_data[i+7] << 16);
+
+                               if ( (eeprom_data[i + 8] && 0xf0) &&
+                                       (tvee->serial_number < 0xffffff) ) {
+                                       tvee->MAC_address[0] = 0x00;
+                                       tvee->MAC_address[1] = 0x0D;
+                                       tvee->MAC_address[2] = 0xFE;
+                                       tvee->MAC_address[3] = eeprom_data[i + 7];
+                                       tvee->MAC_address[4] = eeprom_data[i + 6];
+                                       tvee->MAC_address[5] = eeprom_data[i + 5];
+                                       tvee->has_MAC_address = 1;
+                               }
                        break;
 
                case 0x05:
@@ -466,11 +497,14 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                case 0x06:
                        /* tag 'ModelRev' */
                        tvee->model =
-                               eeprom_data[i+1] +
-                               (eeprom_data[i+2] << 8);
-                       tvee->revision = eeprom_data[i+5] +
-                               (eeprom_data[i+6] << 8) +
-                               (eeprom_data[i+7] << 16);
+                               eeprom_data[i + 1] +
+                               (eeprom_data[i + 2] << 8) +
+                               (eeprom_data[i + 3] << 16) +
+                               (eeprom_data[i + 4] << 24);
+                       tvee->revision =
+                               eeprom_data[i +5 ] +
+                               (eeprom_data[i + 6] << 8) +
+                               (eeprom_data[i + 7] << 16);
                        break;
 
                case 0x07:
@@ -563,6 +597,8 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                t_name2 = "unknown";
        }
 
+       tvee->tuner_hauppauge_model = tuner1;
+       tvee->tuner2_hauppauge_model = tuner2;
        tvee->tuner_formats = 0;
        tvee->tuner2_formats = 0;
        for (i = j = 0; i < 8; i++) {
@@ -578,6 +614,12 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
 
        tveeprom_info("Hauppauge model %d, rev %s, serial# %d\n",
                tvee->model, tvee->rev_str, tvee->serial_number);
+       if (tvee->has_MAC_address == 1) {
+               tveeprom_info("MAC address is %02X-%02X-%02X-%02X-%02X-%02X\n",
+                       tvee->MAC_address[0], tvee->MAC_address[1],
+                       tvee->MAC_address[2], tvee->MAC_address[3],
+                       tvee->MAC_address[4], tvee->MAC_address[5]);
+       }
        tveeprom_info("tuner model is %s (idx %d, type %d)\n",
                t_name1, tuner1, tvee->tuner_type);
        tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n",
@@ -709,9 +751,9 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_tveeprom;
-       client->flags = I2C_CLIENT_ALLOW_USE;
        snprintf(client->name, sizeof(client->name), "tveeprom");
-        i2c_attach_client(client);
+       i2c_attach_client(client);
+
        return 0;
 }
 
@@ -736,10 +778,10 @@ tveeprom_detach_client (struct i2c_client *client)
 }
 
 static struct i2c_driver i2c_driver_tveeprom = {
-       .owner          = THIS_MODULE,
-       .name           = "tveeprom",
+       .driver = {
+               .name   = "tveeprom",
+       },
        .id             = I2C_DRIVERID_TVEEPROM,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = tveeprom_attach_adapter,
        .detach_client  = tveeprom_detach_client,
        .command        = tveeprom_command,
Pandora Kernel Repository