Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] CodingStyle cleanup at s5h1432 and cx231xx

The patches received from the vendor contained a lot of CodingStyle
issues. Cleans the style issues reported by checkpatch.pl on
those drivers.

It is better to do such style fixes when merging a big set of
changes than latter. Of course, the better is to receive patches
already cleaned ;)

Acked-by: Sri Deevi <Srinivasa.Deevi@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

+429 -451
+19 -26
drivers/media/dvb/frontends/s5h1432.c
··· 1 1 /* 2 - Samsung s5h1432 DVB-T demodulator driver 3 - 4 - Copyright (C) 2009 Bill Liu <Bill.Liu@Conexant.com> 5 - 6 - This program is free software; you can redistribute it and/or modify 7 - it under the terms of the GNU General Public License as published by 8 - the Free Software Foundation; either version 2 of the License, or 9 - (at your option) any later version. 10 - 11 - This program is distributed in the hope that it will be useful, 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 - GNU General Public License for more details. 15 - 16 - You should have received a copy of the GNU General Public License 17 - along with this program; if not, write to the Free Software 18 - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 - 20 - */ 2 + * Samsung s5h1432 DVB-T demodulator driver 3 + * 4 + * Copyright (C) 2009 Bill Liu <Bill.Liu@Conexant.com> 5 + * 6 + * This program is free software; you can redistribute it and/or modify 7 + * it under the terms of the GNU General Public License as published by 8 + * the Free Software Foundation; either version 2 of the License, or 9 + * (at your option) any later version. 10 + * 11 + * This program is distributed in the hope that it will be useful, 12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 + * GNU General Public License for more details. 15 + * 16 + * You should have received a copy of the GNU General Public License 17 + * along with this program; if not, write to the Free Software 18 + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 + */ 21 20 22 21 #include <linux/kernel.h> 23 22 #include <linux/init.h> ··· 161 162 value = (u32) (((48000 - (ifFreqHz / 1000)) * 512 * 162 163 (u32) 32768) / (48 * 1000)); 163 164 printk(KERN_INFO 164 - "Default IFFreq %d :reg value = 0x%x \n", 165 + "Default IFFreq %d :reg value = 0x%x\n", 165 166 ifFreqHz, value); 166 167 s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0xe4, 167 168 (u8) value & 0xFF); ··· 378 379 kfree(state); 379 380 return NULL; 380 381 } 381 - 382 382 EXPORT_SYMBOL(s5h1432_attach); 383 383 384 384 static struct dvb_frontend_ops s5h1432_ops = { ··· 413 415 MODULE_DESCRIPTION("Samsung s5h1432 DVB-T Demodulator driver"); 414 416 MODULE_AUTHOR("Bill Liu"); 415 417 MODULE_LICENSE("GPL"); 416 - 417 - /* 418 - * Local variables: 419 - * c-basic-offset: 8 420 - */
+19 -24
drivers/media/dvb/frontends/s5h1432.h
··· 1 1 /* 2 - Samsung s5h1432 VSB/QAM demodulator driver 3 - 4 - Copyright (C) 2009 Bill Liu <Bill.Liu@Conexant.com> 5 - 6 - This program is free software; you can redistribute it and/or modify 7 - it under the terms of the GNU General Public License as published by 8 - the Free Software Foundation; either version 2 of the License, or 9 - (at your option) any later version. 10 - 11 - This program is distributed in the hope that it will be useful, 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 - GNU General Public License for more details. 15 - 16 - You should have received a copy of the GNU General Public License 17 - along with this program; if not, write to the Free Software 18 - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 - 20 - */ 2 + * Samsung s5h1432 VSB/QAM demodulator driver 3 + * 4 + * Copyright (C) 2009 Bill Liu <Bill.Liu@Conexant.com> 5 + * 6 + * This program is free software; you can redistribute it and/or modify 7 + * it under the terms of the GNU General Public License as published by 8 + * the Free Software Foundation; either version 2 of the License, or 9 + * (at your option) any later version. 10 + * 11 + * This program is distributed in the hope that it will be useful, 12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 + * GNU General Public License for more details. 15 + * 16 + * You should have received a copy of the GNU General Public License 17 + * along with this program; if not, write to the Free Software 18 + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 + * 20 + */ 21 21 22 22 #ifndef __S5H1432_H__ 23 23 #define __S5H1432_H__ ··· 89 89 #endif /* CONFIG_DVB_s5h1432 */ 90 90 91 91 #endif /* __s5h1432_H__ */ 92 - 93 - /* 94 - * Local variables: 95 - * c-basic-offset: 8 96 - */
+305 -310
drivers/media/video/cx231xx/cx231xx-417.c
··· 43 43 #define CX231xx_FIRM_IMAGE_SIZE 376836 44 44 #define CX231xx_FIRM_IMAGE_NAME "v4l-cx23885-enc.fw" 45 45 46 - /* for polaris ITVC*/ 46 + /* for polaris ITVC */ 47 47 #define ITVC_WRITE_DIR 0x03FDFC00 48 48 #define ITVC_READ_DIR 0x0001FC00 49 49 ··· 66 66 67 67 #define MCI_REGISTER_MODE 0x70 68 68 69 - /*Read and write modes 70 - for polaris ITVC*/ 69 + /* Read and write modes for polaris ITVC */ 71 70 #define MCI_MODE_REGISTER_READ 0x000 72 71 #define MCI_MODE_REGISTER_WRITE 0x100 73 72 #define MCI_MODE_MEMORY_READ 0x000 ··· 249 250 #define IVTV_REG_VPU (0x9058) 250 251 #define IVTV_REG_APU (0xA064) 251 252 252 - /**** Bit definitions for MC417_RWD and MC417_OEN registers *** 253 - bits 31-16 254 - +-----------+ 255 - | Reserved | 256 - +-----------+ 257 - bit 15 bit 14 bit 13 bit 12 bit 11 bit 10 bit 9 bit 8 258 - +-------+-------+-------+-------+-------+-------+-------+-------+ 259 - | MIWR# | MIRD# | MICS# |MIRDY# |MIADDR3|MIADDR2|MIADDR1|MIADDR0| 260 - +-------+-------+-------+-------+-------+-------+-------+-------+ 261 - bit 7 bit 6 bit 5 bit 4 bit 3 bit 2 bit 1 bit 0 262 - +-------+-------+-------+-------+-------+-------+-------+-------+ 263 - |MIDATA7|MIDATA6|MIDATA5|MIDATA4|MIDATA3|MIDATA2|MIDATA1|MIDATA0| 264 - +-------+-------+-------+-------+-------+-------+-------+-------+ 265 - ***/ 253 + /* 254 + * Bit definitions for MC417_RWD and MC417_OEN registers 255 + * 256 + * bits 31-16 257 + *+-----------+ 258 + *| Reserved | 259 + *|+-----------+ 260 + *| bit 15 bit 14 bit 13 bit 12 bit 11 bit 10 bit 9 bit 8 261 + *|+-------+-------+-------+-------+-------+-------+-------+-------+ 262 + *|| MIWR# | MIRD# | MICS# |MIRDY# |MIADDR3|MIADDR2|MIADDR1|MIADDR0| 263 + *|+-------+-------+-------+-------+-------+-------+-------+-------+ 264 + *| bit 7 bit 6 bit 5 bit 4 bit 3 bit 2 bit 1 bit 0 265 + *|+-------+-------+-------+-------+-------+-------+-------+-------+ 266 + *||MIDATA7|MIDATA6|MIDATA5|MIDATA4|MIDATA3|MIDATA2|MIDATA1|MIDATA0| 267 + *|+-------+-------+-------+-------+-------+-------+-------+-------+ 268 + */ 266 269 #define MC417_MIWR 0x8000 267 270 #define MC417_MIRD 0x4000 268 271 #define MC417_MICS 0x2000 ··· 273 272 #define MC417_MIDATA 0x00FF 274 273 275 274 276 - /*** Bit definitions for MC417_CTL register **** 277 - bits 31-6 bits 5-4 bit 3 bits 2-1 Bit 0 278 - +--------+-------------+--------+--------------+------------+ 279 - |Reserved|MC417_SPD_CTL|Reserved|MC417_GPIO_SEL|UART_GPIO_EN| 280 - +--------+-------------+--------+--------------+------------+ 281 - ***/ 275 + /* Bit definitions for MC417_CTL register **** 276 + *bits 31-6 bits 5-4 bit 3 bits 2-1 Bit 0 277 + *+--------+-------------+--------+--------------+------------+ 278 + *|Reserved|MC417_SPD_CTL|Reserved|MC417_GPIO_SEL|UART_GPIO_EN| 279 + *+--------+-------------+--------+--------------+------------+ 280 + */ 282 281 #define MC417_SPD_CTL(x) (((x) << 4) & 0x00000030) 283 282 #define MC417_GPIO_SEL(x) (((x) << 1) & 0x00000006) 284 283 #define MC417_UART_GPIO_EN 0x00000001 ··· 321 320 } 322 321 int waitForMciComplete(struct cx231xx *dev) 323 322 { 324 - u32 gpio; 325 - u32 gpio_driection = 0; 326 - u8 count = 0; 327 - getITVCReg(dev, gpio_driection, &gpio); 328 - 329 - while (!(gpio&0x020000)) { 330 - msleep(10); 331 - 323 + u32 gpio; 324 + u32 gpio_driection = 0; 325 + u8 count = 0; 332 326 getITVCReg(dev, gpio_driection, &gpio); 333 327 334 - if (count++ > 100) { 335 - dprintk(3, "ERROR: Timeout - gpio=%x\n", gpio); 336 - return -1; 328 + while (!(gpio&0x020000)) { 329 + msleep(10); 330 + 331 + getITVCReg(dev, gpio_driection, &gpio); 332 + 333 + if (count++ > 100) { 334 + dprintk(3, "ERROR: Timeout - gpio=%x\n", gpio); 335 + return -1; 336 + } 337 337 } 338 - } 339 338 return 0; 340 339 } 340 + 341 341 int mc417_register_write(struct cx231xx *dev, u16 address, u32 value) 342 342 { 343 - u32 temp; 343 + u32 temp; 344 344 int status = 0; 345 345 346 - temp = 0x82|MCI_REGISTER_DATA_BYTE0|((value&0x000000FF)<<8); 347 - temp = temp<<10; 348 - status = setITVCReg(dev, ITVC_WRITE_DIR, temp); 346 + temp = 0x82|MCI_REGISTER_DATA_BYTE0|((value&0x000000FF)<<8); 347 + temp = temp<<10; 348 + status = setITVCReg(dev, ITVC_WRITE_DIR, temp); 349 349 if (status < 0) 350 350 return status; 351 - temp = temp|((0x05)<<10); 352 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 351 + temp = temp|((0x05)<<10); 352 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 353 353 354 - /*write data byte 1;*/ 355 - temp = 0x82|MCI_REGISTER_DATA_BYTE1|(value&0x0000FF00); 356 - temp = temp<<10; 357 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 358 - temp = temp|((0x05)<<10); 359 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 354 + /*write data byte 1;*/ 355 + temp = 0x82|MCI_REGISTER_DATA_BYTE1|(value&0x0000FF00); 356 + temp = temp<<10; 357 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 358 + temp = temp|((0x05)<<10); 359 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 360 360 361 - /*write data byte 2;*/ 362 - temp = 0x82|MCI_REGISTER_DATA_BYTE2|((value&0x00FF0000)>>8); 363 - temp = temp<<10; 364 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 365 - temp = temp|((0x05)<<10); 366 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 361 + /*write data byte 2;*/ 362 + temp = 0x82|MCI_REGISTER_DATA_BYTE2|((value&0x00FF0000)>>8); 363 + temp = temp<<10; 364 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 365 + temp = temp|((0x05)<<10); 366 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 367 367 368 - /*write data byte 3;*/ 369 - temp = 0x82|MCI_REGISTER_DATA_BYTE3|((value&0xFF000000)>>16); 370 - temp = temp<<10; 371 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 372 - temp = temp|((0x05)<<10); 373 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 368 + /*write data byte 3;*/ 369 + temp = 0x82|MCI_REGISTER_DATA_BYTE3|((value&0xFF000000)>>16); 370 + temp = temp<<10; 371 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 372 + temp = temp|((0x05)<<10); 373 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 374 374 375 - /*write address byte 0;*/ 376 - temp = 0x82|MCI_REGISTER_ADDRESS_BYTE0|((address&0x000000FF)<<8); 377 - temp = temp<<10; 378 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 379 - temp = temp|((0x05)<<10); 380 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 375 + /*write address byte 0;*/ 376 + temp = 0x82|MCI_REGISTER_ADDRESS_BYTE0|((address&0x000000FF)<<8); 377 + temp = temp<<10; 378 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 379 + temp = temp|((0x05)<<10); 380 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 381 381 382 - /*write address byte 1;*/ 383 - temp = 0x82|MCI_REGISTER_ADDRESS_BYTE1|(address&0x0000FF00); 384 - temp = temp<<10; 385 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 386 - temp = temp|((0x05)<<10); 387 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 382 + /*write address byte 1;*/ 383 + temp = 0x82|MCI_REGISTER_ADDRESS_BYTE1|(address&0x0000FF00); 384 + temp = temp<<10; 385 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 386 + temp = temp|((0x05)<<10); 387 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 388 388 389 - /*Write that the mode is write.*/ 390 - temp = 0x82 | MCI_REGISTER_MODE | MCI_MODE_REGISTER_WRITE; 391 - temp = temp<<10; 392 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 393 - temp = temp|((0x05)<<10); 394 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 389 + /*Write that the mode is write.*/ 390 + temp = 0x82 | MCI_REGISTER_MODE | MCI_MODE_REGISTER_WRITE; 391 + temp = temp<<10; 392 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 393 + temp = temp|((0x05)<<10); 394 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 395 395 396 - return waitForMciComplete(dev); 397 - 396 + return waitForMciComplete(dev); 398 397 } 399 - 400 398 401 399 int mc417_register_read(struct cx231xx *dev, u16 address, u32 *value) 402 400 { 403 - /*write address byte 0;*/ 404 - u32 temp; 405 - u32 return_value = 0; 401 + /*write address byte 0;*/ 402 + u32 temp; 403 + u32 return_value = 0; 406 404 int ret = 0; 407 405 408 - temp = 0x82|MCI_REGISTER_ADDRESS_BYTE0|((address&0x00FF)<<8); 409 - temp = temp<<10; 410 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 411 - temp = temp|((0x05)<<10); 412 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 406 + temp = 0x82 | MCI_REGISTER_ADDRESS_BYTE0 | ((address & 0x00FF) << 8); 407 + temp = temp << 10; 408 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 409 + temp = temp | ((0x05) << 10); 410 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 413 411 414 - /*write address byte 1;*/ 415 - temp = 0x82|MCI_REGISTER_ADDRESS_BYTE1|(address&0xFF00); 416 - temp = temp<<10; 417 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 418 - temp = temp|((0x05)<<10); 419 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 412 + /*write address byte 1;*/ 413 + temp = 0x82 | MCI_REGISTER_ADDRESS_BYTE1 | (address & 0xFF00); 414 + temp = temp << 10; 415 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 416 + temp = temp | ((0x05) << 10); 417 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 420 418 421 - /*write that the mode is read;*/ 422 - temp = 0x82 | MCI_REGISTER_MODE | MCI_MODE_REGISTER_READ; 423 - temp = temp<<10; 424 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 425 - temp = temp|((0x05)<<10); 426 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 419 + /*write that the mode is read;*/ 420 + temp = 0x82 | MCI_REGISTER_MODE | MCI_MODE_REGISTER_READ; 421 + temp = temp << 10; 422 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 423 + temp = temp | ((0x05) << 10); 424 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 427 425 428 - /*wait for the MIRDY line to be asserted , 429 - signalling that the read is done;*/ 430 - ret = waitForMciComplete(dev); 426 + /*wait for the MIRDY line to be asserted , 427 + signalling that the read is done;*/ 428 + ret = waitForMciComplete(dev); 431 429 430 + /*switch the DATA- GPIO to input mode;*/ 432 431 433 - /*switch the DATA- GPIO to input mode;*/ 432 + /*Read data byte 0;*/ 433 + temp = (0x82 | MCI_REGISTER_DATA_BYTE0) << 10; 434 + setITVCReg(dev, ITVC_READ_DIR, temp); 435 + temp = ((0x81 | MCI_REGISTER_DATA_BYTE0) << 10); 436 + setITVCReg(dev, ITVC_READ_DIR, temp); 437 + getITVCReg(dev, ITVC_READ_DIR, &temp); 438 + return_value |= ((temp & 0x03FC0000) >> 18); 439 + setITVCReg(dev, ITVC_READ_DIR, (0x87 << 10)); 434 440 435 - /*Read data byte 0;*/ 436 - temp = (0x82|MCI_REGISTER_DATA_BYTE0)<<10; 437 - setITVCReg(dev, ITVC_READ_DIR, temp); 438 - temp = ((0x81|MCI_REGISTER_DATA_BYTE0)<<10); 439 - setITVCReg(dev, ITVC_READ_DIR, temp); 440 - getITVCReg(dev, ITVC_READ_DIR, &temp); 441 - return_value |= ((temp&0x03FC0000)>>18); 442 - setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 441 + /* Read data byte 1;*/ 442 + temp = (0x82 | MCI_REGISTER_DATA_BYTE1) << 10; 443 + setITVCReg(dev, ITVC_READ_DIR, temp); 444 + temp = ((0x81 | MCI_REGISTER_DATA_BYTE1) << 10); 445 + setITVCReg(dev, ITVC_READ_DIR, temp); 446 + getITVCReg(dev, ITVC_READ_DIR, &temp); 443 447 444 - /* Read data byte 1;*/ 445 - temp = (0x82|MCI_REGISTER_DATA_BYTE1)<<10; 446 - setITVCReg(dev, ITVC_READ_DIR, temp); 447 - temp = ((0x81|MCI_REGISTER_DATA_BYTE1)<<10); 448 - setITVCReg(dev, ITVC_READ_DIR, temp); 449 - getITVCReg(dev, ITVC_READ_DIR, &temp); 448 + return_value |= ((temp & 0x03FC0000) >> 10); 449 + setITVCReg(dev, ITVC_READ_DIR, (0x87 << 10)); 450 450 451 - return_value |= ((temp&0x03FC0000)>>10); 452 - setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 451 + /*Read data byte 2;*/ 452 + temp = (0x82 | MCI_REGISTER_DATA_BYTE2) << 10; 453 + setITVCReg(dev, ITVC_READ_DIR, temp); 454 + temp = ((0x81 | MCI_REGISTER_DATA_BYTE2) << 10); 455 + setITVCReg(dev, ITVC_READ_DIR, temp); 456 + getITVCReg(dev, ITVC_READ_DIR, &temp); 457 + return_value |= ((temp & 0x03FC0000) >> 2); 458 + setITVCReg(dev, ITVC_READ_DIR, (0x87 << 10)); 453 459 454 - /*Read data byte 2;*/ 455 - temp = (0x82|MCI_REGISTER_DATA_BYTE2)<<10; 456 - setITVCReg(dev, ITVC_READ_DIR, temp); 457 - temp = ((0x81|MCI_REGISTER_DATA_BYTE2)<<10); 458 - setITVCReg(dev, ITVC_READ_DIR, temp); 459 - getITVCReg(dev, ITVC_READ_DIR, &temp); 460 - return_value |= ((temp&0x03FC0000)>>2); 461 - setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 462 - 463 - /*Read data byte 3;*/ 464 - temp = (0x82|MCI_REGISTER_DATA_BYTE3)<<10; 465 - setITVCReg(dev, ITVC_READ_DIR, temp); 466 - temp = ((0x81|MCI_REGISTER_DATA_BYTE3)<<10); 467 - setITVCReg(dev, ITVC_READ_DIR, temp); 468 - getITVCReg(dev, ITVC_READ_DIR, &temp); 469 - return_value |= ((temp&0x03FC0000)<<6); 470 - setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 460 + /*Read data byte 3;*/ 461 + temp = (0x82 | MCI_REGISTER_DATA_BYTE3) << 10; 462 + setITVCReg(dev, ITVC_READ_DIR, temp); 463 + temp = ((0x81 | MCI_REGISTER_DATA_BYTE3) << 10); 464 + setITVCReg(dev, ITVC_READ_DIR, temp); 465 + getITVCReg(dev, ITVC_READ_DIR, &temp); 466 + return_value |= ((temp & 0x03FC0000) << 6); 467 + setITVCReg(dev, ITVC_READ_DIR, (0x87 << 10)); 471 468 472 469 *value = return_value; 473 470 474 471 475 - return ret; 472 + return ret; 476 473 } 477 474 478 475 int mc417_memory_write(struct cx231xx *dev, u32 address, u32 value) 479 476 { 477 + /*write data byte 0;*/ 480 478 481 - /*write data byte 0;*/ 482 - 483 - u32 temp; 479 + u32 temp; 484 480 int ret = 0; 485 481 486 - temp = 0x82|MCI_MEMORY_DATA_BYTE0|((value&0x000000FF)<<8); 487 - temp = temp<<10; 488 - ret = setITVCReg(dev, ITVC_WRITE_DIR, temp); 482 + temp = 0x82 | MCI_MEMORY_DATA_BYTE0|((value & 0x000000FF) << 8); 483 + temp = temp << 10; 484 + ret = setITVCReg(dev, ITVC_WRITE_DIR, temp); 489 485 if (ret < 0) 490 486 return ret; 491 - temp = temp|((0x05)<<10); 492 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 487 + temp = temp | ((0x05) << 10); 488 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 493 489 494 - /*write data byte 1;*/ 495 - temp = 0x82|MCI_MEMORY_DATA_BYTE1|(value&0x0000FF00); 496 - temp = temp<<10; 497 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 498 - temp = temp|((0x05)<<10); 499 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 490 + /*write data byte 1;*/ 491 + temp = 0x82 | MCI_MEMORY_DATA_BYTE1 | (value & 0x0000FF00); 492 + temp = temp << 10; 493 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 494 + temp = temp | ((0x05) << 10); 495 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 500 496 501 - /*write data byte 2;*/ 502 - temp = 0x82|MCI_MEMORY_DATA_BYTE2|((value&0x00FF0000)>>8); 503 - temp = temp<<10; 504 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 505 - temp = temp|((0x05)<<10); 506 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 497 + /*write data byte 2;*/ 498 + temp = 0x82|MCI_MEMORY_DATA_BYTE2|((value&0x00FF0000)>>8); 499 + temp = temp<<10; 500 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 501 + temp = temp|((0x05)<<10); 502 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 507 503 508 - /*write data byte 3;*/ 509 - temp = 0x82|MCI_MEMORY_DATA_BYTE3|((value&0xFF000000)>>16); 510 - temp = temp<<10; 511 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 512 - temp = temp|((0x05)<<10); 513 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 504 + /*write data byte 3;*/ 505 + temp = 0x82|MCI_MEMORY_DATA_BYTE3|((value&0xFF000000)>>16); 506 + temp = temp<<10; 507 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 508 + temp = temp|((0x05)<<10); 509 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 514 510 515 - /* write address byte 2;*/ 516 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE2 | MCI_MODE_MEMORY_WRITE | 511 + /* write address byte 2;*/ 512 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE2 | MCI_MODE_MEMORY_WRITE | 517 513 ((address & 0x003F0000)>>8); 518 - temp = temp<<10; 519 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 520 - temp = temp|((0x05)<<10); 521 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 514 + temp = temp<<10; 515 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 516 + temp = temp|((0x05)<<10); 517 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 522 518 523 - /* write address byte 1;*/ 524 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE1 | (address & 0xFF00); 525 - temp = temp<<10; 526 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 527 - temp = temp|((0x05)<<10); 528 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 519 + /* write address byte 1;*/ 520 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE1 | (address & 0xFF00); 521 + temp = temp<<10; 522 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 523 + temp = temp|((0x05)<<10); 524 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 529 525 530 - /* write address byte 0;*/ 531 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE0|((address & 0x00FF)<<8); 532 - temp = temp<<10; 533 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 534 - temp = temp|((0x05)<<10); 535 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 526 + /* write address byte 0;*/ 527 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE0|((address & 0x00FF)<<8); 528 + temp = temp<<10; 529 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 530 + temp = temp|((0x05)<<10); 531 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 536 532 537 - /*wait for MIRDY line;*/ 538 - waitForMciComplete(dev); 533 + /*wait for MIRDY line;*/ 534 + waitForMciComplete(dev); 539 535 540 - return 0; 541 - 536 + return 0; 542 537 } 543 538 544 539 int mc417_memory_read(struct cx231xx *dev, u32 address, u32 *value) 545 540 { 546 - 547 - u32 temp = 0; 548 - u32 return_value = 0; 541 + u32 temp = 0; 542 + u32 return_value = 0; 549 543 int ret = 0; 550 544 551 - /*write address byte 2;*/ 552 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE2 | MCI_MODE_MEMORY_READ | 545 + /*write address byte 2;*/ 546 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE2 | MCI_MODE_MEMORY_READ | 553 547 ((address & 0x003F0000)>>8); 554 - temp = temp<<10; 555 - ret = setITVCReg(dev, ITVC_WRITE_DIR, temp); 548 + temp = temp<<10; 549 + ret = setITVCReg(dev, ITVC_WRITE_DIR, temp); 556 550 if (ret < 0) 557 551 return ret; 558 - temp = temp|((0x05)<<10); 559 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 552 + temp = temp|((0x05)<<10); 553 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 560 554 561 - /*write address byte 1*/ 562 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE1 | (address & 0xFF00); 563 - temp = temp<<10; 564 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 565 - temp = temp|((0x05)<<10); 566 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 555 + /*write address byte 1*/ 556 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE1 | (address & 0xFF00); 557 + temp = temp<<10; 558 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 559 + temp = temp|((0x05)<<10); 560 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 567 561 568 - /*write address byte 0*/ 569 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE0 | ((address & 0x00FF)<<8); 570 - temp = temp<<10; 571 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 572 - temp = temp|((0x05)<<10); 573 - setITVCReg(dev, ITVC_WRITE_DIR, temp); 562 + /*write address byte 0*/ 563 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE0 | ((address & 0x00FF)<<8); 564 + temp = temp<<10; 565 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 566 + temp = temp|((0x05)<<10); 567 + setITVCReg(dev, ITVC_WRITE_DIR, temp); 574 568 575 - /*Wait for MIRDY line*/ 576 - ret = waitForMciComplete(dev); 569 + /*Wait for MIRDY line*/ 570 + ret = waitForMciComplete(dev); 577 571 578 572 579 - /*Read data byte 3;*/ 580 - temp = (0x82|MCI_MEMORY_DATA_BYTE3)<<10; 581 - setITVCReg(dev, ITVC_READ_DIR, temp); 582 - temp = ((0x81|MCI_MEMORY_DATA_BYTE3)<<10); 583 - setITVCReg(dev, ITVC_READ_DIR, temp); 584 - getITVCReg(dev, ITVC_READ_DIR, &temp); 585 - return_value |= ((temp&0x03FC0000)<<6); 586 - setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 573 + /*Read data byte 3;*/ 574 + temp = (0x82|MCI_MEMORY_DATA_BYTE3)<<10; 575 + setITVCReg(dev, ITVC_READ_DIR, temp); 576 + temp = ((0x81|MCI_MEMORY_DATA_BYTE3)<<10); 577 + setITVCReg(dev, ITVC_READ_DIR, temp); 578 + getITVCReg(dev, ITVC_READ_DIR, &temp); 579 + return_value |= ((temp&0x03FC0000)<<6); 580 + setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 587 581 588 - /*Read data byte 2;*/ 589 - temp = (0x82|MCI_MEMORY_DATA_BYTE2)<<10; 590 - setITVCReg(dev, ITVC_READ_DIR, temp); 591 - temp = ((0x81|MCI_MEMORY_DATA_BYTE2)<<10); 592 - setITVCReg(dev, ITVC_READ_DIR, temp); 593 - getITVCReg(dev, ITVC_READ_DIR, &temp); 594 - return_value |= ((temp&0x03FC0000)>>2); 595 - setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 582 + /*Read data byte 2;*/ 583 + temp = (0x82|MCI_MEMORY_DATA_BYTE2)<<10; 584 + setITVCReg(dev, ITVC_READ_DIR, temp); 585 + temp = ((0x81|MCI_MEMORY_DATA_BYTE2)<<10); 586 + setITVCReg(dev, ITVC_READ_DIR, temp); 587 + getITVCReg(dev, ITVC_READ_DIR, &temp); 588 + return_value |= ((temp&0x03FC0000)>>2); 589 + setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 596 590 597 - /* Read data byte 1;*/ 598 - temp = (0x82|MCI_MEMORY_DATA_BYTE1)<<10; 599 - setITVCReg(dev, ITVC_READ_DIR, temp); 600 - temp = ((0x81|MCI_MEMORY_DATA_BYTE1)<<10); 601 - setITVCReg(dev, ITVC_READ_DIR, temp); 602 - getITVCReg(dev, ITVC_READ_DIR, &temp); 603 - return_value |= ((temp&0x03FC0000)>>10); 604 - setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 591 + /* Read data byte 1;*/ 592 + temp = (0x82|MCI_MEMORY_DATA_BYTE1)<<10; 593 + setITVCReg(dev, ITVC_READ_DIR, temp); 594 + temp = ((0x81|MCI_MEMORY_DATA_BYTE1)<<10); 595 + setITVCReg(dev, ITVC_READ_DIR, temp); 596 + getITVCReg(dev, ITVC_READ_DIR, &temp); 597 + return_value |= ((temp&0x03FC0000)>>10); 598 + setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 605 599 606 - /*Read data byte 0;*/ 607 - temp = (0x82|MCI_MEMORY_DATA_BYTE0)<<10; 608 - setITVCReg(dev, ITVC_READ_DIR, temp); 609 - temp = ((0x81|MCI_MEMORY_DATA_BYTE0)<<10); 610 - setITVCReg(dev, ITVC_READ_DIR, temp); 611 - getITVCReg(dev, ITVC_READ_DIR, &temp); 612 - return_value |= ((temp&0x03FC0000)>>18); 613 - setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 600 + /*Read data byte 0;*/ 601 + temp = (0x82|MCI_MEMORY_DATA_BYTE0)<<10; 602 + setITVCReg(dev, ITVC_READ_DIR, temp); 603 + temp = ((0x81|MCI_MEMORY_DATA_BYTE0)<<10); 604 + setITVCReg(dev, ITVC_READ_DIR, temp); 605 + getITVCReg(dev, ITVC_READ_DIR, &temp); 606 + return_value |= ((temp&0x03FC0000)>>18); 607 + setITVCReg(dev, ITVC_READ_DIR, (0x87<<10)); 614 608 615 609 *value = return_value; 616 - return ret; 610 + return ret; 617 611 } 618 612 619 613 void mc417_gpio_set(struct cx231xx *dev, u32 mask) ··· 880 884 u32 temp = 0; 881 885 int i = 0; 882 886 883 - temp = 0x82|MCI_MEMORY_DATA_BYTE0|((value&0x000000FF)<<8); 884 - temp = temp<<10; 885 - *p_fw_image = temp; 886 - p_fw_image++; 887 - temp = temp|((0x05)<<10); 888 - *p_fw_image = temp; 889 - p_fw_image++; 890 - 891 - /*write data byte 1;*/ 892 - temp = 0x82|MCI_MEMORY_DATA_BYTE1|(value&0x0000FF00); 893 - temp = temp<<10; 894 - *p_fw_image = temp; 895 - p_fw_image++; 896 - temp = temp|((0x05)<<10); 897 - *p_fw_image = temp; 898 - p_fw_image++; 899 - 900 - /*write data byte 2;*/ 901 - temp = 0x82|MCI_MEMORY_DATA_BYTE2|((value&0x00FF0000)>>8); 902 - temp = temp<<10; 903 - *p_fw_image = temp; 904 - p_fw_image++; 905 - temp = temp|((0x05)<<10); 906 - *p_fw_image = temp; 907 - p_fw_image++; 908 - 909 - /*write data byte 3;*/ 910 - temp = 0x82|MCI_MEMORY_DATA_BYTE3|((value&0xFF000000)>>16); 911 - temp = temp<<10; 912 - *p_fw_image = temp; 913 - p_fw_image++; 914 - temp = temp|((0x05)<<10); 915 - *p_fw_image = temp; 916 - p_fw_image++; 917 - 918 - /* write address byte 2;*/ 919 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE2 | MCI_MODE_MEMORY_WRITE | 920 - ((address & 0x003F0000)>>8); 921 - temp = temp<<10; 922 - *p_fw_image = temp; 923 - p_fw_image++; 924 - temp = temp|((0x05)<<10); 925 - *p_fw_image = temp; 926 - p_fw_image++; 927 - 928 - /* write address byte 1;*/ 929 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE1 | (address & 0xFF00); 930 - temp = temp<<10; 931 - *p_fw_image = temp; 932 - p_fw_image++; 933 - temp = temp|((0x05)<<10); 934 - *p_fw_image = temp; 935 - p_fw_image++; 936 - 937 - /* write address byte 0;*/ 938 - temp = 0x82|MCI_MEMORY_ADDRESS_BYTE0|((address & 0x00FF)<<8); 939 - temp = temp<<10; 940 - *p_fw_image = temp; 941 - p_fw_image++; 942 - temp = temp|((0x05)<<10); 943 - *p_fw_image = temp; 944 - p_fw_image++; 945 - 946 - for (i = 0; i < 6; i++) { 947 - *p_fw_image = 0xFFFFFFFF; 887 + temp = 0x82|MCI_MEMORY_DATA_BYTE0|((value&0x000000FF)<<8); 888 + temp = temp<<10; 889 + *p_fw_image = temp; 948 890 p_fw_image++; 949 - } 891 + temp = temp|((0x05)<<10); 892 + *p_fw_image = temp; 893 + p_fw_image++; 950 894 895 + /*write data byte 1;*/ 896 + temp = 0x82|MCI_MEMORY_DATA_BYTE1|(value&0x0000FF00); 897 + temp = temp<<10; 898 + *p_fw_image = temp; 899 + p_fw_image++; 900 + temp = temp|((0x05)<<10); 901 + *p_fw_image = temp; 902 + p_fw_image++; 903 + 904 + /*write data byte 2;*/ 905 + temp = 0x82|MCI_MEMORY_DATA_BYTE2|((value&0x00FF0000)>>8); 906 + temp = temp<<10; 907 + *p_fw_image = temp; 908 + p_fw_image++; 909 + temp = temp|((0x05)<<10); 910 + *p_fw_image = temp; 911 + p_fw_image++; 912 + 913 + /*write data byte 3;*/ 914 + temp = 0x82|MCI_MEMORY_DATA_BYTE3|((value&0xFF000000)>>16); 915 + temp = temp<<10; 916 + *p_fw_image = temp; 917 + p_fw_image++; 918 + temp = temp|((0x05)<<10); 919 + *p_fw_image = temp; 920 + p_fw_image++; 921 + 922 + /* write address byte 2;*/ 923 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE2 | MCI_MODE_MEMORY_WRITE | 924 + ((address & 0x003F0000)>>8); 925 + temp = temp<<10; 926 + *p_fw_image = temp; 927 + p_fw_image++; 928 + temp = temp|((0x05)<<10); 929 + *p_fw_image = temp; 930 + p_fw_image++; 931 + 932 + /* write address byte 1;*/ 933 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE1 | (address & 0xFF00); 934 + temp = temp<<10; 935 + *p_fw_image = temp; 936 + p_fw_image++; 937 + temp = temp|((0x05)<<10); 938 + *p_fw_image = temp; 939 + p_fw_image++; 940 + 941 + /* write address byte 0;*/ 942 + temp = 0x82|MCI_MEMORY_ADDRESS_BYTE0|((address & 0x00FF)<<8); 943 + temp = temp<<10; 944 + *p_fw_image = temp; 945 + p_fw_image++; 946 + temp = temp|((0x05)<<10); 947 + *p_fw_image = temp; 948 + p_fw_image++; 949 + 950 + for (i = 0; i < 6; i++) { 951 + *p_fw_image = 0xFFFFFFFF; 952 + p_fw_image++; 953 + } 951 954 } 952 955 953 956 ··· 1050 1055 p_fw_data += 1; 1051 1056 } 1052 1057 1053 - /*download the firmware by ep5-out*/ 1058 + /*download the firmware by ep5-out*/ 1054 1059 1055 1060 for (frame = 0; frame < (int)(CX231xx_FIRM_IMAGE_SIZE*20/_buffer_size); 1056 1061 frame++) { ··· 2107 2112 .vidioc_g_std = vidioc_g_std, 2108 2113 .vidioc_enum_input = vidioc_enum_input, 2109 2114 .vidioc_enumaudio = vidioc_enumaudio, 2110 - .vidioc_g_audio = vidioc_g_audio, 2115 + .vidioc_g_audio = vidioc_g_audio, 2111 2116 .vidioc_g_input = vidioc_g_input, 2112 2117 .vidioc_s_input = vidioc_s_input, 2113 2118 .vidioc_g_tuner = vidioc_g_tuner,
+63 -68
drivers/media/video/cx231xx/cx231xx-avcore.c
··· 55 55 *******************************************************************************/ 56 56 /****************************************************************************** 57 57 * VERVE REGISTER * 58 - * * 58 + * * 59 59 ******************************************************************************/ 60 60 static int verve_write_byte(struct cx231xx *dev, u8 saddr, u8 data) 61 61 { ··· 936 936 { 937 937 u8 temp = 0; 938 938 int status; 939 - /*enable TS1 data[0:7] as output to export 656*/ 939 + /*enable TS1 data[0:7] as output to export 656*/ 940 940 941 941 status = vid_blk_write_byte(dev, TS1_PIN_CTL0, 0xFF); 942 942 943 - /*enable TS1 clock as output to export 656*/ 943 + /*enable TS1 clock as output to export 656*/ 944 944 945 945 status = vid_blk_read_byte(dev, TS1_PIN_CTL1, &temp); 946 946 temp = temp|0x04; ··· 1344 1344 i = i+3; 1345 1345 } 1346 1346 1347 - status = vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value); 1348 - cx231xx_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value); 1349 - vid_blk_write_word(dev, AFE_CTRL_C2HH_SRC_CTRL, 0x4485D390); 1350 - status = vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value); 1351 - cx231xx_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value); 1352 - 1347 + status = vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value); 1348 + cx231xx_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value); 1349 + vid_blk_write_word(dev, AFE_CTRL_C2HH_SRC_CTRL, 0x4485D390); 1350 + status = vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value); 1351 + cx231xx_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value); 1353 1352 } 1353 + 1354 1354 void cx231xx_dump_SC_reg(struct cx231xx *dev) 1355 1355 { 1356 1356 u8 value[4] = { 0, 0, 0, 0 }; ··· 1455 1455 1456 1456 1457 1457 /* 1458 - config colibri to lo-if mode 1458 + config colibri to lo-if mode 1459 1459 1460 - FIXME: ntf_mode = 2'b00 by default. But set 0x1 would reduce 1461 - the diff IF input by half, 1460 + FIXME: ntf_mode = 2'b00 by default. But set 0x1 would reduce 1461 + the diff IF input by half, 1462 1462 1463 - for low-if agc defect 1463 + for low-if agc defect 1464 1464 */ 1465 1465 1466 1466 status = afe_read_byte(dev, ADC_NTF_PRECLMP_EN_CH3, &value); ··· 1535 1535 1536 1536 u32 cx231xx_Get_Colibri_CarrierOffset(u32 mode, u32 standerd) 1537 1537 { 1538 - u32 colibri_carrier_offset = 0; 1538 + u32 colibri_carrier_offset = 0; 1539 1539 1540 - 1541 - if (mode == TUNER_MODE_FM_RADIO) { 1540 + if (mode == TUNER_MODE_FM_RADIO) { 1542 1541 colibri_carrier_offset = 1100000; 1543 1542 } else if (standerd & (V4L2_STD_NTSC | V4L2_STD_NTSC_M_JP)) { 1544 1543 colibri_carrier_offset = 4832000; /*4.83MHz */ ··· 1548 1549 colibri_carrier_offset = 2100000; /*2.10MHz */ 1549 1550 } 1550 1551 1551 - 1552 - return colibri_carrier_offset; 1552 + return colibri_carrier_offset; 1553 1553 } 1554 1554 1555 1555 void cx231xx_set_DIF_bandpass(struct cx231xx *dev, u32 if_freq, 1556 1556 u8 spectral_invert, u32 mode) 1557 1557 { 1558 - 1559 - unsigned long pll_freq_word; 1560 - int status = 0; 1561 - u32 dif_misc_ctrl_value = 0; 1562 - u64 pll_freq_u64 = 0; 1563 - u32 i = 0; 1564 - 1558 + unsigned long pll_freq_word; 1559 + int status = 0; 1560 + u32 dif_misc_ctrl_value = 0; 1561 + u64 pll_freq_u64 = 0; 1562 + u32 i = 0; 1565 1563 1566 1564 cx231xx_info("if_freq=%d;spectral_invert=0x%x;mode=0x%x\n", 1567 1565 if_freq, spectral_invert, mode); 1568 1566 1569 1567 1570 - if (mode == TUNER_MODE_FM_RADIO) { 1571 - pll_freq_word = 0x905A1CAC; 1572 - status = vid_blk_write_word(dev, DIF_PLL_FREQ_WORD, pll_freq_word); 1568 + if (mode == TUNER_MODE_FM_RADIO) { 1569 + pll_freq_word = 0x905A1CAC; 1570 + status = vid_blk_write_word(dev, DIF_PLL_FREQ_WORD, pll_freq_word); 1573 1571 1574 - } else /*KSPROPERTY_TUNER_MODE_TV*/{ 1575 - /* Calculate the PLL frequency word based on the adjusted if_freq*/ 1576 - pll_freq_word = if_freq; 1577 - pll_freq_u64 = (u64)pll_freq_word << 28L; 1578 - do_div(pll_freq_u64, 50000000); 1579 - pll_freq_word = (u32)pll_freq_u64; 1580 - /*pll_freq_word = 0x3463497;*/ 1581 - status = vid_blk_write_word(dev, DIF_PLL_FREQ_WORD, pll_freq_word); 1572 + } else /*KSPROPERTY_TUNER_MODE_TV*/{ 1573 + /* Calculate the PLL frequency word based on the adjusted if_freq*/ 1574 + pll_freq_word = if_freq; 1575 + pll_freq_u64 = (u64)pll_freq_word << 28L; 1576 + do_div(pll_freq_u64, 50000000); 1577 + pll_freq_word = (u32)pll_freq_u64; 1578 + /*pll_freq_word = 0x3463497;*/ 1579 + status = vid_blk_write_word(dev, DIF_PLL_FREQ_WORD, pll_freq_word); 1582 1580 1583 - if (spectral_invert) { 1584 - if_freq -= 400000; 1585 - /* Enable Spectral Invert*/ 1586 - status = vid_blk_read_word(dev, DIF_MISC_CTRL, 1587 - &dif_misc_ctrl_value); 1588 - dif_misc_ctrl_value = dif_misc_ctrl_value | 0x00200000; 1589 - status = vid_blk_write_word(dev, DIF_MISC_CTRL, 1590 - dif_misc_ctrl_value); 1591 - } else { 1592 - if_freq += 400000; 1593 - /* Disable Spectral Invert*/ 1594 - status = vid_blk_read_word(dev, DIF_MISC_CTRL, 1595 - &dif_misc_ctrl_value); 1596 - dif_misc_ctrl_value = dif_misc_ctrl_value & 0xFFDFFFFF; 1597 - status = vid_blk_write_word(dev, DIF_MISC_CTRL, 1598 - dif_misc_ctrl_value); 1599 - } 1581 + if (spectral_invert) { 1582 + if_freq -= 400000; 1583 + /* Enable Spectral Invert*/ 1584 + status = vid_blk_read_word(dev, DIF_MISC_CTRL, 1585 + &dif_misc_ctrl_value); 1586 + dif_misc_ctrl_value = dif_misc_ctrl_value | 0x00200000; 1587 + status = vid_blk_write_word(dev, DIF_MISC_CTRL, 1588 + dif_misc_ctrl_value); 1589 + } else { 1590 + if_freq += 400000; 1591 + /* Disable Spectral Invert*/ 1592 + status = vid_blk_read_word(dev, DIF_MISC_CTRL, 1593 + &dif_misc_ctrl_value); 1594 + dif_misc_ctrl_value = dif_misc_ctrl_value & 0xFFDFFFFF; 1595 + status = vid_blk_write_word(dev, DIF_MISC_CTRL, 1596 + dif_misc_ctrl_value); 1597 + } 1600 1598 1601 1599 if_freq = (if_freq/100000)*100000; 1602 1600 1603 - if (if_freq < 3000000) 1604 - if_freq = 3000000; 1601 + if (if_freq < 3000000) 1602 + if_freq = 3000000; 1605 1603 1606 - if (if_freq > 16000000) 1607 - if_freq = 16000000; 1608 - } 1609 - 1610 - cx231xx_info("Enter IF=%zd\n", 1611 - sizeof(Dif_set_array)/sizeof(struct dif_settings)); 1612 - for (i = 0; i < sizeof(Dif_set_array)/sizeof(struct dif_settings); i++) { 1613 - if (Dif_set_array[i].if_freq == if_freq) { 1614 - status = vid_blk_write_word(dev, 1615 - Dif_set_array[i].register_address, Dif_set_array[i].value); 1604 + if (if_freq > 16000000) 1605 + if_freq = 16000000; 1616 1606 } 1617 - } 1618 1607 1608 + cx231xx_info("Enter IF=%zd\n", 1609 + sizeof(Dif_set_array)/sizeof(struct dif_settings)); 1610 + for (i = 0; i < sizeof(Dif_set_array)/sizeof(struct dif_settings); i++) { 1611 + if (Dif_set_array[i].if_freq == if_freq) { 1612 + status = vid_blk_write_word(dev, 1613 + Dif_set_array[i].register_address, Dif_set_array[i].value); 1614 + } 1615 + } 1619 1616 } 1620 1617 1621 1618 /****************************************************************************** ··· 2117 2122 { 2118 2123 int status = 0; 2119 2124 u32 dwval; 2120 - cx231xx_info("cx231xx_tuner_post_channel_change dev->tuner_type =0%d\n", 2121 - dev->tuner_type); 2125 + cx231xx_info("cx231xx_tuner_post_channel_change dev->tuner_type =0%d\n", 2126 + dev->tuner_type); 2122 2127 /* Set the RF and IF k_agc values to 4 for PAL/NTSC and 8 for 2123 2128 * SECAM L/B/D standards */ 2124 2129 status = vid_blk_read_word(dev, DIF_AGC_IF_REF, &dwval);
+17 -17
drivers/media/video/cx231xx/cx231xx-dif.h
··· 1 1 /* 2 - cx231xx-dif.h - driver for Conexant Cx23100/101/102 USB video capture devices 3 - 4 - Copyright {C} 2009 <Bill.Liu@conexant.com> 5 - 6 - This program is free software, you can redistribute it and/or modify 7 - it under the terms of the GNU General Public License as published by 8 - the Free Software Foundation, either version 2 of the License, or 9 - (at your option) any later version. 10 - 11 - This program is distributed in the hope that it will be useful, 12 - but WITHOUT ANY WARRANTY, without even the implied warranty of 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 - GNU General Public License for more details. 15 - 16 - You should have received a copy of the GNU General Public License 17 - along with this program, if not, write to the Free Software 18 - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 2 + * cx231xx-dif.h - driver for Conexant Cx23100/101/102 USB video capture devices 3 + * 4 + * Copyright {C} 2009 <Bill.Liu@conexant.com> 5 + * 6 + * This program is free software, you can redistribute it and/or modify 7 + * it under the terms of the GNU General Public License as published by 8 + * the Free Software Foundation, either version 2 of the License, or 9 + * (at your option) any later version. 10 + * 11 + * This program is distributed in the hope that it will be useful, 12 + * but WITHOUT ANY WARRANTY, without even the implied warranty of 13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 + * GNU General Public License for more details. 15 + * 16 + * You should have received a copy of the GNU General Public License 17 + * along with this program, if not, write to the Free Software 18 + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 19 */ 20 20 21 21 #ifndef _CX231XX_DIF_H
+6 -6
drivers/media/video/cx231xx/cx231xx.h
··· 56 56 57 57 /* Boards supported by driver */ 58 58 #define CX231XX_BOARD_UNKNOWN 0 59 - #define CX231XX_BOARD_CNXT_CARRAERA 1 60 - #define CX231XX_BOARD_CNXT_SHELBY 2 61 - #define CX231XX_BOARD_CNXT_RDE_253S 3 62 - #define CX231XX_BOARD_CNXT_RDU_253S 4 59 + #define CX231XX_BOARD_CNXT_CARRAERA 1 60 + #define CX231XX_BOARD_CNXT_SHELBY 2 61 + #define CX231XX_BOARD_CNXT_RDE_253S 3 62 + #define CX231XX_BOARD_CNXT_RDU_253S 4 63 63 #define CX231XX_BOARD_CNXT_VIDEO_GRABBER 5 64 - #define CX231XX_BOARD_CNXT_RDE_250 6 65 - #define CX231XX_BOARD_CNXT_RDU_250 7 64 + #define CX231XX_BOARD_CNXT_RDE_250 6 65 + #define CX231XX_BOARD_CNXT_RDU_250 7 66 66 #define CX231XX_BOARD_HAUPPAUGE_EXETER 8 67 67 #define CX231XX_BOARD_HAUPPAUGE_USBLIVE2 9 68 68