[media] cx23885: Name an internal i2c part and declare a bitfield by name

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 307ff543c2543ba75251121411ca05f59e868d69..0ff7a9e98f3e637c6a9ef6d258c08e80de2e8c6c 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -287,6 +287,7 @@ static char *i2c_devs[128] = {
        [0x32 >> 1] = "cx24227",
        [0x88 >> 1] = "cx25837",
        [0x84 >> 1] = "tda8295",
+       [0x98 >> 1] = "flatiron",
        [0xa0 >> 1] = "eeprom",
        [0xc0 >> 1] = "tuner/mt2131/tda8275",
        [0xc2 >> 1] = "tuner/mt2131/tda8275/xc5000/xc3028",

diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h
index 12b4d3ac134bcce44374595b3d15467c95d390aa..a99936e0cbc270c5d9fe5ad29eeafd0101c4304d 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/drivers/media/video/cx23885/cx23885-reg.h
@@ -203,6 +203,7 @@ Channel manager Data Structure entry = 20 DWORD
 #define SD2_BIAS_CTRL  0x0000000A
 #define AMP_BIAS_CTRL  0x0000000C
 #define CH_PWR_CTRL1   0x0000000E
+#define FLD_CH_SEL      (1 << 3)
 #define CH_PWR_CTRL2   0x0000000F
 #define DSM_STATUS1    0x00000010
 #define DSM_STATUS2    0x00000011