diff options
Diffstat (limited to 'drivers/media/video/tda9875.c')
-rw-r--r-- | drivers/media/video/tda9875.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c index 7e3dcdb262b0..5a9faefc3640 100644 --- a/drivers/media/video/tda9875.c +++ b/drivers/media/video/tda9875.c | |||
@@ -126,20 +126,20 @@ static int tda9875_write(struct i2c_client *client, int subaddr, unsigned char v | |||
126 | 126 | ||
127 | static int i2c_read_register(struct i2c_adapter *adap, int addr, int reg) | 127 | static int i2c_read_register(struct i2c_adapter *adap, int addr, int reg) |
128 | { | 128 | { |
129 | unsigned char write[1]; | 129 | unsigned char write[1]; |
130 | unsigned char read[1]; | 130 | unsigned char read[1]; |
131 | struct i2c_msg msgs[2] = { | 131 | struct i2c_msg msgs[2] = { |
132 | { addr, 0, 1, write }, | 132 | { addr, 0, 1, write }, |
133 | { addr, I2C_M_RD, 1, read } | 133 | { addr, I2C_M_RD, 1, read } |
134 | }; | 134 | }; |
135 | write[0] = reg; | 135 | write[0] = reg; |
136 | 136 | ||
137 | if (2 != i2c_transfer(adap,msgs,2)) { | 137 | if (2 != i2c_transfer(adap,msgs,2)) { |
138 | printk(KERN_WARNING "tda9875: I/O error (read2)\n"); | 138 | printk(KERN_WARNING "tda9875: I/O error (read2)\n"); |
139 | return -1; | 139 | return -1; |
140 | } | 140 | } |
141 | dprintk("tda9875: chip_read2: reg%d=0x%x\n",reg,read[0]); | 141 | dprintk("tda9875: chip_read2: reg%d=0x%x\n",reg,read[0]); |
142 | return read[0]; | 142 | return read[0]; |
143 | } | 143 | } |
144 | 144 | ||
145 | static void tda9875_set(struct i2c_client *client) | 145 | static void tda9875_set(struct i2c_client *client) |
@@ -184,7 +184,7 @@ static void do_tda9875_init(struct i2c_client *client) | |||
184 | tda9875_write(client, TDA9875_DACOS, 0x02 ); /* sig DAC i/o(in:nicam)*/ | 184 | tda9875_write(client, TDA9875_DACOS, 0x02 ); /* sig DAC i/o(in:nicam)*/ |
185 | tda9875_write(client, TDA9875_ADCIS, 0x6f ); /* sig ADC input(in:mono)*/ | 185 | tda9875_write(client, TDA9875_ADCIS, 0x6f ); /* sig ADC input(in:mono)*/ |
186 | tda9875_write(client, TDA9875_LOSR, 0x00 ); /* line out (in:mono)*/ | 186 | tda9875_write(client, TDA9875_LOSR, 0x00 ); /* line out (in:mono)*/ |
187 | tda9875_write(client, TDA9875_AER, 0x00 ); /*06 Effect (AVL+PSEUDO) */ | 187 | tda9875_write(client, TDA9875_AER, 0x00 ); /*06 Effect (AVL+PSEUDO) */ |
188 | tda9875_write(client, TDA9875_MCS, 0x44 ); /* Main ch select (DAC) */ | 188 | tda9875_write(client, TDA9875_MCS, 0x44 ); /* Main ch select (DAC) */ |
189 | tda9875_write(client, TDA9875_MVL, 0x03 ); /* Vol Main left 10dB */ | 189 | tda9875_write(client, TDA9875_MVL, 0x03 ); /* Vol Main left 10dB */ |
190 | tda9875_write(client, TDA9875_MVR, 0x03 ); /* Vol Main right 10dB*/ | 190 | tda9875_write(client, TDA9875_MVR, 0x03 ); /* Vol Main right 10dB*/ |
@@ -200,7 +200,7 @@ static void do_tda9875_init(struct i2c_client *client) | |||
200 | 200 | ||
201 | t->mode=AUDIO_UNMUTE; | 201 | t->mode=AUDIO_UNMUTE; |
202 | t->lvol=t->rvol =0; /* 0dB */ | 202 | t->lvol=t->rvol =0; /* 0dB */ |
203 | t->bass=0; /* 0dB */ | 203 | t->bass=0; /* 0dB */ |
204 | t->treble=0; /* 0dB */ | 204 | t->treble=0; /* 0dB */ |
205 | tda9875_set(client); | 205 | tda9875_set(client); |
206 | 206 | ||
@@ -239,9 +239,9 @@ static int tda9875_attach(struct i2c_adapter *adap, int addr, int kind) | |||
239 | memset(t,0,sizeof *t); | 239 | memset(t,0,sizeof *t); |
240 | 240 | ||
241 | client = &t->c; | 241 | client = &t->c; |
242 | memcpy(client,&client_template,sizeof(struct i2c_client)); | 242 | memcpy(client,&client_template,sizeof(struct i2c_client)); |
243 | client->adapter = adap; | 243 | client->adapter = adap; |
244 | client->addr = addr; | 244 | client->addr = addr; |
245 | i2c_set_clientdata(client, t); | 245 | i2c_set_clientdata(client, t); |
246 | 246 | ||
247 | if(!tda9875_checkit(adap,addr)) { | 247 | if(!tda9875_checkit(adap,addr)) { |
@@ -287,7 +287,7 @@ static int tda9875_command(struct i2c_client *client, | |||
287 | dprintk("In tda9875_command...\n"); | 287 | dprintk("In tda9875_command...\n"); |
288 | 288 | ||
289 | switch (cmd) { | 289 | switch (cmd) { |
290 | /* --- v4l ioctls --- */ | 290 | /* --- v4l ioctls --- */ |
291 | /* take care: bttv does userspace copying, we'll get a | 291 | /* take care: bttv does userspace copying, we'll get a |
292 | kernel pointer here... */ | 292 | kernel pointer here... */ |
293 | case VIDIOCGAUDIO: | 293 | case VIDIOCGAUDIO: |
@@ -355,7 +355,7 @@ static int tda9875_command(struct i2c_client *client, | |||
355 | //printk("tda9875 bal:%04x vol:%04x bass:%04x treble:%04x\n",va->balance,va->volume,va->bass,va->treble); | 355 | //printk("tda9875 bal:%04x vol:%04x bass:%04x treble:%04x\n",va->balance,va->volume,va->bass,va->treble); |
356 | 356 | ||
357 | 357 | ||
358 | tda9875_set(client); | 358 | tda9875_set(client); |
359 | 359 | ||
360 | break; | 360 | break; |
361 | 361 | ||
@@ -374,18 +374,18 @@ static int tda9875_command(struct i2c_client *client, | |||
374 | 374 | ||
375 | static struct i2c_driver driver = { | 375 | static struct i2c_driver driver = { |
376 | .owner = THIS_MODULE, | 376 | .owner = THIS_MODULE, |
377 | .name = "i2c tda9875 driver", | 377 | .name = "i2c tda9875 driver", |
378 | .id = I2C_DRIVERID_TDA9875, | 378 | .id = I2C_DRIVERID_TDA9875, |
379 | .flags = I2C_DF_NOTIFY, | 379 | .flags = I2C_DF_NOTIFY, |
380 | .attach_adapter = tda9875_probe, | 380 | .attach_adapter = tda9875_probe, |
381 | .detach_client = tda9875_detach, | 381 | .detach_client = tda9875_detach, |
382 | .command = tda9875_command, | 382 | .command = tda9875_command, |
383 | }; | 383 | }; |
384 | 384 | ||
385 | static struct i2c_client client_template = | 385 | static struct i2c_client client_template = |
386 | { | 386 | { |
387 | .name = "tda9875", | 387 | .name = "tda9875", |
388 | .driver = &driver, | 388 | .driver = &driver, |
389 | }; | 389 | }; |
390 | 390 | ||
391 | static int __init tda9875_init(void) | 391 | static int __init tda9875_init(void) |