V4L/DVB (3548): Renamed I2C_foo addresses to I2C_ADDR_foo

+1 -1

drivers/media/video/bt8xx/bt832.c

··· 39 39 MODULE_LICENSE("GPL"); 40 40 41 41 /* Addresses to scan */ 42 - static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1, 42 + static unsigned short normal_i2c[] = { I2C_ADDR_BT832_ALT1>>1, I2C_ADDR_BT832_ALT2>>1, 43 43 I2C_CLIENT_END }; 44 44 I2C_CLIENT_INSMOD; 45 45

+8 -8

drivers/media/video/bt8xx/bttv-cards.c

··· 3046 3046 gpio_inout(0xffffff, 0); 3047 3047 gpio = gpio_read(); 3048 3048 id = ((gpio>>10) & 63) -1; 3049 - msp = bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx"); 3049 + msp = bttv_I2CRead(btv, I2C_ADDR_MSP3400, "MSP34xx"); 3050 3050 if (id < 32) { 3051 3051 btv->tuner_type = miro_tunermap[id]; 3052 3052 if (0 == (gpio & 0x20)) { ··· 3442 3442 3443 3443 if (bttv_tvcards[btv->c.type].digital_mode == DIGITAL_MODE_CAMERA) { 3444 3444 /* detect Bt832 chip for quartzsight digital camera */ 3445 - if ((bttv_I2CRead(btv, I2C_BT832_ALT1, "Bt832") >=0) || 3446 - (bttv_I2CRead(btv, I2C_BT832_ALT2, "Bt832") >=0)) 3445 + if ((bttv_I2CRead(btv, I2C_ADDR_BT832_ALT1, "Bt832") >=0) || 3446 + (bttv_I2CRead(btv, I2C_ADDR_BT832_ALT2, "Bt832") >=0)) 3447 3447 boot_bt832(btv); 3448 3448 } 3449 3449 ··· 3452 3452 3453 3453 /* try to detect audio/fader chips */ 3454 3454 if (!bttv_tvcards[btv->c.type].no_msp34xx && 3455 - bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx") >=0) 3455 + bttv_I2CRead(btv, I2C_ADDR_MSP3400, "MSP34xx") >=0) 3456 3456 request_module("msp3400"); 3457 3457 3458 3458 if (bttv_tvcards[btv->c.type].msp34xx_alt && 3459 - bttv_I2CRead(btv, I2C_MSP3400_ALT, "MSP34xx (alternate address)") >=0) 3459 + bttv_I2CRead(btv, I2C_ADDR_MSP3400_ALT, "MSP34xx (alternate address)") >=0) 3460 3460 request_module("msp3400"); 3461 3461 3462 3462 if (!bttv_tvcards[btv->c.type].no_tda9875 && 3463 - bttv_I2CRead(btv, I2C_TDA9875, "TDA9875") >=0) 3463 + bttv_I2CRead(btv, I2C_ADDR_TDA9875, "TDA9875") >=0) 3464 3464 request_module("tda9875"); 3465 3465 3466 3466 if (!bttv_tvcards[btv->c.type].no_tda7432 && 3467 - bttv_I2CRead(btv, I2C_TDA7432, "TDA7432") >=0) 3467 + bttv_I2CRead(btv, I2C_ADDR_TDA7432, "TDA7432") >=0) 3468 3468 request_module("tda7432"); 3469 3469 3470 3470 if (bttv_tvcards[btv->c.type].needs_tvaudio) ··· 3475 3475 if (btv->tda9887_conf) 3476 3476 tda9887 = 1; 3477 3477 if (0 == tda9887 && 0 == bttv_tvcards[btv->c.type].has_dvb && 3478 - bttv_I2CRead(btv, I2C_TDA9887, "TDA9887") >=0) 3478 + bttv_I2CRead(btv, I2C_ADDR_TDA9887, "TDA9887") >=0) 3479 3479 tda9887 = 1; 3480 3480 /* Hybrid DVB card, DOES have a tda9887 */ 3481 3481 if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)

+3 -3

drivers/media/video/mxb.c

··· 198 198 /* loop through all i2c-devices on the bus and look who is there */ 199 199 list_for_each(item,&mxb->i2c_adapter.clients) { 200 200 client = list_entry(item, struct i2c_client, list); 201 - if( I2C_TEA6420_1 == client->addr ) 201 + if( I2C_ADDR_TEA6420_1 == client->addr ) 202 202 mxb->tea6420_1 = client; 203 - if( I2C_TEA6420_2 == client->addr ) 203 + if( I2C_ADDR_TEA6420_2 == client->addr ) 204 204 mxb->tea6420_2 = client; 205 205 if( I2C_TEA6415C_2 == client->addr ) 206 206 mxb->tea6415c = client; 207 - if( I2C_TDA9840 == client->addr ) 207 + if( I2C_ADDR_TDA9840 == client->addr ) 208 208 mxb->tda9840 = client; 209 209 if( I2C_SAA7111 == client->addr ) 210 210 mxb->saa7111a = client;

+1 -1

drivers/media/video/tda7432.c

··· 71 71 72 72 /* Address to scan (I2C address of this chip) */ 73 73 static unsigned short normal_i2c[] = { 74 - I2C_TDA7432 >> 1, 74 + I2C_ADDR_TDA7432 >> 1, 75 75 I2C_CLIENT_END, 76 76 }; 77 77 I2C_CLIENT_INSMOD;

+1 -1

drivers/media/video/tda9840.c

··· 43 43 #define TEST 0x04 44 44 45 45 /* addresses to scan, found only at 0x42 (7-Bit) */ 46 - static unsigned short normal_i2c[] = { I2C_TDA9840, I2C_CLIENT_END }; 46 + static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END }; 47 47 48 48 /* magic definition of all other variables and things */ 49 49 I2C_CLIENT_INSMOD;

+1 -1

drivers/media/video/tda9840.h

··· 1 1 #ifndef __INCLUDED_TDA9840__ 2 2 #define __INCLUDED_TDA9840__ 3 3 4 - #define I2C_TDA9840 0x42 4 + #define I2C_ADDR_TDA9840 0x42 5 5 6 6 #define TDA9840_DETECT _IOR('v',1,int) 7 7 /* return values for TDA9840_DETCT */

+1 -1

drivers/media/video/tda9875.c

··· 40 40 41 41 /* Addresses to scan */ 42 42 static unsigned short normal_i2c[] = { 43 - I2C_TDA9875 >> 1, 43 + I2C_ADDR_TDA9875 >> 1, 44 44 I2C_CLIENT_END 45 45 }; 46 46 I2C_CLIENT_INSMOD;

+1 -1

drivers/media/video/tea6420.c

··· 40 40 do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0) 41 41 42 42 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */ 43 - static unsigned short normal_i2c[] = { I2C_TEA6420_1, I2C_TEA6420_2, I2C_CLIENT_END }; 43 + static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END }; 44 44 45 45 /* magic definition of all other variables and things */ 46 46 I2C_CLIENT_INSMOD;

+2 -2

drivers/media/video/tea6420.h

··· 2 2 #define __INCLUDED_TEA6420__ 3 3 4 4 /* possible addresses */ 5 - #define I2C_TEA6420_1 0x4c 6 - #define I2C_TEA6420_2 0x4d 5 + #define I2C_ADDR_TEA6420_1 0x4c 6 + #define I2C_ADDR_TEA6420_2 0x4d 7 7 8 8 struct tea6420_multiplex 9 9 {

+30 -30

drivers/media/video/tvaudio.c

··· 137 137 /* i2c addresses */ 138 138 139 139 static unsigned short normal_i2c[] = { 140 - I2C_TDA8425 >> 1, 141 - I2C_TEA6300 >> 1, 142 - I2C_TEA6420 >> 1, 143 - I2C_TDA9840 >> 1, 144 - I2C_TDA985x_L >> 1, 145 - I2C_TDA985x_H >> 1, 146 - I2C_TDA9874 >> 1, 147 - I2C_PIC16C54 >> 1, 140 + I2C_ADDR_TDA8425 >> 1, 141 + I2C_ADDR_TEA6300 >> 1, 142 + I2C_ADDR_TEA6420 >> 1, 143 + I2C_ADDR_TDA9840 >> 1, 144 + I2C_ADDR_TDA985x_L >> 1, 145 + I2C_ADDR_TDA985x_H >> 1, 146 + I2C_ADDR_TDA9874 >> 1, 147 + I2C_ADDR_PIC16C54 >> 1, 148 148 I2C_CLIENT_END }; 149 149 I2C_CLIENT_INSMOD; 150 150 ··· 1269 1269 .name = "tda9840", 1270 1270 .id = I2C_DRIVERID_TDA9840, 1271 1271 .insmodopt = &tda9840, 1272 - .addr_lo = I2C_TDA9840 >> 1, 1273 - .addr_hi = I2C_TDA9840 >> 1, 1272 + .addr_lo = I2C_ADDR_TDA9840 >> 1, 1273 + .addr_hi = I2C_ADDR_TDA9840 >> 1, 1274 1274 .registers = 5, 1275 1275 1276 1276 .checkit = tda9840_checkit, ··· 1286 1286 .id = I2C_DRIVERID_TDA9873, 1287 1287 .checkit = tda9873_checkit, 1288 1288 .insmodopt = &tda9873, 1289 - .addr_lo = I2C_TDA985x_L >> 1, 1290 - .addr_hi = I2C_TDA985x_H >> 1, 1289 + .addr_lo = I2C_ADDR_TDA985x_L >> 1, 1290 + .addr_hi = I2C_ADDR_TDA985x_H >> 1, 1291 1291 .registers = 3, 1292 1292 .flags = CHIP_HAS_INPUTSEL, 1293 1293 ··· 1308 1308 .checkit = tda9874a_checkit, 1309 1309 .initialize = tda9874a_initialize, 1310 1310 .insmodopt = &tda9874a, 1311 - .addr_lo = I2C_TDA9874 >> 1, 1312 - .addr_hi = I2C_TDA9874 >> 1, 1311 + .addr_lo = I2C_ADDR_TDA9874 >> 1, 1312 + .addr_hi = I2C_ADDR_TDA9874 >> 1, 1313 1313 1314 1314 .getmode = tda9874a_getmode, 1315 1315 .setmode = tda9874a_setmode, ··· 1319 1319 .name = "tda9850", 1320 1320 .id = I2C_DRIVERID_TDA9850, 1321 1321 .insmodopt = &tda9850, 1322 - .addr_lo = I2C_TDA985x_L >> 1, 1323 - .addr_hi = I2C_TDA985x_H >> 1, 1322 + .addr_lo = I2C_ADDR_TDA985x_L >> 1, 1323 + .addr_hi = I2C_ADDR_TDA985x_H >> 1, 1324 1324 .registers = 11, 1325 1325 1326 1326 .getmode = tda985x_getmode, ··· 1332 1332 .name = "tda9855", 1333 1333 .id = I2C_DRIVERID_TDA9855, 1334 1334 .insmodopt = &tda9855, 1335 - .addr_lo = I2C_TDA985x_L >> 1, 1336 - .addr_hi = I2C_TDA985x_H >> 1, 1335 + .addr_lo = I2C_ADDR_TDA985x_L >> 1, 1336 + .addr_hi = I2C_ADDR_TDA985x_H >> 1, 1337 1337 .registers = 11, 1338 1338 .flags = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE, 1339 1339 ··· 1357 1357 .name = "tea6300", 1358 1358 .id = I2C_DRIVERID_TEA6300, 1359 1359 .insmodopt = &tea6300, 1360 - .addr_lo = I2C_TEA6300 >> 1, 1361 - .addr_hi = I2C_TEA6300 >> 1, 1360 + .addr_lo = I2C_ADDR_TEA6300 >> 1, 1361 + .addr_hi = I2C_ADDR_TEA6300 >> 1, 1362 1362 .registers = 6, 1363 1363 .flags = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL, 1364 1364 ··· 1379 1379 .id = I2C_DRIVERID_TEA6300, 1380 1380 .initialize = tea6320_initialize, 1381 1381 .insmodopt = &tea6320, 1382 - .addr_lo = I2C_TEA6300 >> 1, 1383 - .addr_hi = I2C_TEA6300 >> 1, 1382 + .addr_lo = I2C_ADDR_TEA6300 >> 1, 1383 + .addr_hi = I2C_ADDR_TEA6300 >> 1, 1384 1384 .registers = 8, 1385 1385 .flags = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL, 1386 1386 ··· 1400 1400 .name = "tea6420", 1401 1401 .id = I2C_DRIVERID_TEA6420, 1402 1402 .insmodopt = &tea6420, 1403 - .addr_lo = I2C_TEA6420 >> 1, 1404 - .addr_hi = I2C_TEA6420 >> 1, 1403 + .addr_lo = I2C_ADDR_TEA6420 >> 1, 1404 + .addr_hi = I2C_ADDR_TEA6420 >> 1, 1405 1405 .registers = 1, 1406 1406 .flags = CHIP_HAS_INPUTSEL, 1407 1407 ··· 1413 1413 .name = "tda8425", 1414 1414 .id = I2C_DRIVERID_TDA8425, 1415 1415 .insmodopt = &tda8425, 1416 - .addr_lo = I2C_TDA8425 >> 1, 1417 - .addr_hi = I2C_TDA8425 >> 1, 1416 + .addr_lo = I2C_ADDR_TDA8425 >> 1, 1417 + .addr_hi = I2C_ADDR_TDA8425 >> 1, 1418 1418 .registers = 9, 1419 1419 .flags = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL, 1420 1420 ··· 1437 1437 .name = "pic16c54 (PV951)", 1438 1438 .id = I2C_DRIVERID_PIC16C54_PV9, 1439 1439 .insmodopt = &pic16c54, 1440 - .addr_lo = I2C_PIC16C54 >> 1, 1441 - .addr_hi = I2C_PIC16C54>> 1, 1440 + .addr_lo = I2C_ADDR_PIC16C54 >> 1, 1441 + .addr_hi = I2C_ADDR_PIC16C54>> 1, 1442 1442 .registers = 2, 1443 1443 .flags = CHIP_HAS_INPUTSEL, 1444 1444 ··· 1456 1456 /*.id = I2C_DRIVERID_TA8874Z, */ 1457 1457 .checkit = ta8874z_checkit, 1458 1458 .insmodopt = &ta8874z, 1459 - .addr_lo = I2C_TDA9840 >> 1, 1460 - .addr_hi = I2C_TDA9840 >> 1, 1459 + .addr_lo = I2C_ADDR_TDA9840 >> 1, 1460 + .addr_hi = I2C_ADDR_TDA9840 >> 1, 1461 1461 .registers = 2, 1462 1462 1463 1463 .getmode = ta8874z_getmode,

+29 -29

include/media/i2c-addr.h

··· 1 1 /* 2 - * V4L I2C address list 2 + * V4L I2C address list 3 3 * 4 4 * 5 - * Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org> 5 + * Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org> 6 6 * Based on a previous mapping by 7 - * Ralph Metzler (rjkm@thp.uni-koeln.de) 8 - * Gerd Knorr <kraxel@goldbach.in-berlin.de> 7 + * Ralph Metzler (rjkm@thp.uni-koeln.de) 8 + * Gerd Knorr <kraxel@goldbach.in-berlin.de> 9 9 * 10 10 */ 11 11 12 12 /* bttv address list */ 13 - #define I2C_TSA5522 0xc2 14 - #define I2C_TDA7432 0x8a 15 - #define I2C_BT832_ALT1 0x88 16 - #define I2C_BT832_ALT2 0x8a // alternate setting 17 - #define I2C_TDA8425 0x82 18 - #define I2C_TDA9840 0x84 19 - #define I2C_TDA9850 0xb6 /* also used by 9855,9873 */ 20 - #define I2C_TDA9874 0xb0 /* also used by 9875 */ 21 - #define I2C_TDA9875 0xb0 22 - #define I2C_HAUPEE 0xa0 23 - #define I2C_STBEE 0xae 24 - #define I2C_VHX 0xc0 25 - #define I2C_MSP3400 0x80 26 - #define I2C_MSP3400_ALT 0x88 27 - #define I2C_TEA6300 0x80 /* also used by 6320 */ 28 - #define I2C_DPL3518 0x84 29 - #define I2C_TDA9887 0x86 13 + #define I2C_ADDR_TSA5522 0xc2 14 + #define I2C_ADDR_TDA7432 0x8a 15 + #define I2C_ADDR_BT832_ALT1 0x88 16 + #define I2C_ADDR_BT832_ALT2 0x8a // alternate setting 17 + #define I2C_ADDR_TDA8425 0x82 18 + #define I2C_ADDR_TDA9840 0x84 19 + #define I2C_ADDR_TDA9850 0xb6 /* also used by 9855,9873 */ 20 + #define I2C_ADDR_TDA9874 0xb0 /* also used by 9875 */ 21 + #define I2C_ADDR_TDA9875 0xb0 22 + #define I2C_ADDR_HAUPEE 0xa0 23 + #define I2C_ADDR_STBEE 0xae 24 + #define I2C_ADDR_VHX 0xc0 25 + #define I2C_ADDR_MSP3400 0x80 26 + #define I2C_ADDR_MSP3400_ALT 0x88 27 + #define I2C_ADDR_TEA6300 0x80 /* also used by 6320 */ 28 + #define I2C_ADDR_DPL3518 0x84 29 + #define I2C_ADDR_TDA9887 0x86 30 30 31 31 /* 32 32 * i2c bus addresses for the chips supported by tvaudio.c 33 33 */ 34 34 35 - #define I2C_TDA8425 0x82 36 - #define I2C_TDA9840 0x84 /* also used by TA8874Z */ 37 - #define I2C_TDA985x_L 0xb4 /* also used by 9873 */ 38 - #define I2C_TDA985x_H 0xb6 39 - #define I2C_TDA9874 0xb0 /* also used by 9875 */ 35 + #define I2C_ADDR_TDA8425 0x82 36 + #define I2C_ADDR_TDA9840 0x84 /* also used by TA8874Z */ 37 + #define I2C_ADDR_TDA985x_L 0xb4 /* also used by 9873 */ 38 + #define I2C_ADDR_TDA985x_H 0xb6 39 + #define I2C_ADDR_TDA9874 0xb0 /* also used by 9875 */ 40 40 41 - #define I2C_TEA6300 0x80 /* also used by 6320 */ 42 - #define I2C_TEA6420 0x98 41 + #define I2C_ADDR_TEA6300 0x80 /* also used by 6320 */ 42 + #define I2C_ADDR_TEA6420 0x98 43 43 44 - #define I2C_PIC16C54 0x96 /* PV951 */ 44 + #define I2C_ADDR_PIC16C54 0x96 /* PV951 */