summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-18 08:31:34 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-24 16:26:51 -0300
commit09df1c163adcf43e2c4234b52985f34b95b7634e (patch)
tree26bfc6ba4d135f932038e2b41c79d86c474d5abd /include/media
parent7c9b5048305ead226fb16def98d86f3ed67c4807 (diff)
downloadlinux-09df1c163adcf43e2c4234b52985f34b95b7634e.tar.bz2
V4L/DVB (3548): Renamed I2C_foo addresses to I2C_ADDR_foo
I2C_foo were used for some i2c addresses. Bad, since those constants could mean other i2c chip things. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/i2c-addr.h58
1 files changed, 29 insertions, 29 deletions
diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h
index 7b0f5fe94e08..e7ff44a35ca0 100644
--- a/include/media/i2c-addr.h
+++ b/include/media/i2c-addr.h
@@ -1,44 +1,44 @@
/*
- * V4L I2C address list
+ * V4L I2C address list
*
*
- * Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ * Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
* Based on a previous mapping by
- * Ralph Metzler (rjkm@thp.uni-koeln.de)
- * Gerd Knorr <kraxel@goldbach.in-berlin.de>
+ * Ralph Metzler (rjkm@thp.uni-koeln.de)
+ * Gerd Knorr <kraxel@goldbach.in-berlin.de>
*
*/
/* bttv address list */
-#define I2C_TSA5522 0xc2
-#define I2C_TDA7432 0x8a
-#define I2C_BT832_ALT1 0x88
-#define I2C_BT832_ALT2 0x8a // alternate setting
-#define I2C_TDA8425 0x82
-#define I2C_TDA9840 0x84
-#define I2C_TDA9850 0xb6 /* also used by 9855,9873 */
-#define I2C_TDA9874 0xb0 /* also used by 9875 */
-#define I2C_TDA9875 0xb0
-#define I2C_HAUPEE 0xa0
-#define I2C_STBEE 0xae
-#define I2C_VHX 0xc0
-#define I2C_MSP3400 0x80
-#define I2C_MSP3400_ALT 0x88
-#define I2C_TEA6300 0x80 /* also used by 6320 */
-#define I2C_DPL3518 0x84
-#define I2C_TDA9887 0x86
+#define I2C_ADDR_TSA5522 0xc2
+#define I2C_ADDR_TDA7432 0x8a
+#define I2C_ADDR_BT832_ALT1 0x88
+#define I2C_ADDR_BT832_ALT2 0x8a // alternate setting
+#define I2C_ADDR_TDA8425 0x82
+#define I2C_ADDR_TDA9840 0x84
+#define I2C_ADDR_TDA9850 0xb6 /* also used by 9855,9873 */
+#define I2C_ADDR_TDA9874 0xb0 /* also used by 9875 */
+#define I2C_ADDR_TDA9875 0xb0
+#define I2C_ADDR_HAUPEE 0xa0
+#define I2C_ADDR_STBEE 0xae
+#define I2C_ADDR_VHX 0xc0
+#define I2C_ADDR_MSP3400 0x80
+#define I2C_ADDR_MSP3400_ALT 0x88
+#define I2C_ADDR_TEA6300 0x80 /* also used by 6320 */
+#define I2C_ADDR_DPL3518 0x84
+#define I2C_ADDR_TDA9887 0x86
/*
* i2c bus addresses for the chips supported by tvaudio.c
*/
-#define I2C_TDA8425 0x82
-#define I2C_TDA9840 0x84 /* also used by TA8874Z */
-#define I2C_TDA985x_L 0xb4 /* also used by 9873 */
-#define I2C_TDA985x_H 0xb6
-#define I2C_TDA9874 0xb0 /* also used by 9875 */
+#define I2C_ADDR_TDA8425 0x82
+#define I2C_ADDR_TDA9840 0x84 /* also used by TA8874Z */
+#define I2C_ADDR_TDA985x_L 0xb4 /* also used by 9873 */
+#define I2C_ADDR_TDA985x_H 0xb6
+#define I2C_ADDR_TDA9874 0xb0 /* also used by 9875 */
-#define I2C_TEA6300 0x80 /* also used by 6320 */
-#define I2C_TEA6420 0x98
+#define I2C_ADDR_TEA6300 0x80 /* also used by 6320 */
+#define I2C_ADDR_TEA6420 0x98
-#define I2C_PIC16C54 0x96 /* PV951 */
+#define I2C_ADDR_PIC16C54 0x96 /* PV951 */