forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e 
 kernel/drivers/media/i2c/nvp6158_drv/nvp6158_drv.c
....@@ -82,8 +82,8 @@
8282     I2C_BOARD_INFO("nvp6158", 0x60),
8383 };
8484 static bool nvp6158_init_state;
85
-unsigned int nvp6158_gCoaxFirmUpdateFlag[16]={0,};
86
-unsigned char nvp6158_det_mode[16]={NVP6158_DET_MODE_AUTO,};
85
+unsigned int nvp6158_gCoaxFirmUpdateFlag[16] = {0,};
86
+unsigned char nvp6158_det_mode[16] = {NVP6158_DET_MODE_AUTO,};
8787 struct semaphore nvp6158_lock;
8888 extern unsigned char nvp6158_ch_mode_status[16];
8989 extern unsigned char nvp6158_ch_vfmt_status[16];
....@@ -92,7 +92,7 @@
9292 #define NVP6158_DRIVER_VER "1.1.01"
9393 #define NVP6158_HW_REG(reg)         *((volatile unsigned int *)(reg))
9494 
95
-int nvp6158_g_soc_chiptype=0x3521;
95
+int nvp6158_g_soc_chiptype = 0x3521;
9696 int nvp6158_chip_id[4];
9797 int nvp6158_rev_id[4];
9898 
....@@ -144,22 +144,16 @@
144144 
145145     /* check Device ID of maxium 4chip on the slave address,
146146      * manage slave address. chip count. */
147
-	for(chip=0;chip<4;chip++)
148
-	{
147
+	for(chip = 0; chip < 4; chip ++) {
149148 		nvp6158_chip_id[chip] = nvp6158_check_id(nvp6158_iic_addr[chip]);
150149 		nvp6158_rev_id[chip]  = nvp6158_check_rev(nvp6158_iic_addr[chip]);
151
-		if( (nvp6158_chip_id[chip] != NVP6158_R0_ID )  	&& 
152
-			(nvp6158_chip_id[chip] != NVP6158C_R0_ID) 	&&
153
-			(nvp6158_chip_id[chip] != NVP6168_R0_ID )  	&& 
154
-			(nvp6158_chip_id[chip] != NVP6168C_R0_ID) )
155
-		{
150
+		if( (nvp6158_chip_id[chip] != NVP6158_R0_ID ) && (nvp6158_chip_id[chip] != NVP6158C_R0_ID) &&
151
+			(nvp6158_chip_id[chip] != NVP6168_R0_ID ) && (nvp6158_chip_id[chip] != NVP6168C_R0_ID)) {
156152 			printk("[NVP6158_DRV]Device ID Error... 0x%x\n", nvp6158_chip_id[chip]);
157
-		}
158
-		else
159
-		{
153
+		} else {
160154 			printk("[NVP6158_DRV]Device (0x%x) ID OK... 0x%x\n", nvp6158_iic_addr[chip], nvp6158_chip_id[chip]);
161155 			printk("[NVP6158_DRV]Device (0x%x) REV ... 0x%x\n", nvp6158_iic_addr[chip], nvp6158_rev_id[chip]);
162
-			nvp6158_iic_addr[nvp6158_cnt] = nvp6158_iic_addr[chip];	
156
+			nvp6158_iic_addr[nvp6158_cnt] = nvp6158_iic_addr[chip];
163157 			if(nvp6158_cnt<chip)
164158 				nvp6158_iic_addr[chip] = 0xFF;
165159 			nvp6158_chip_id[nvp6158_cnt] = nvp6158_chip_id[chip];
....@@ -169,9 +163,12 @@
169163 	}
170164 
171165 	printk("[NVP6158_DRV]Chip Count = %d\n", nvp6158_cnt);
172
-	printk("[NVP6158_DRV]Address [0x%x][0x%x][0x%x][0x%x]\n",nvp6158_iic_addr[0],nvp6158_iic_addr[1],nvp6158_iic_addr[2],nvp6158_iic_addr[3]);
173
-	printk("[NVP6158_DRV]Chip Id [0x%x][0x%x][0x%x][0x%x]\n",nvp6158_chip_id[0],nvp6158_chip_id[1],nvp6158_chip_id[2],nvp6158_chip_id[3]);
174
-	printk("[NVP6158_DRV]Rev Id [0x%x][0x%x][0x%x][0x%x]\n",nvp6158_rev_id[0],nvp6158_rev_id[1],nvp6158_rev_id[2],nvp6158_rev_id[3]);
166
+	printk("[NVP6158_DRV]Address [0x%x][0x%x][0x%x][0x%x]\n", nvp6158_iic_addr[0],
167
+			nvp6158_iic_addr[1], nvp6158_iic_addr[2], nvp6158_iic_addr[3]);
168
+	printk("[NVP6158_DRV]Chip Id [0x%x][0x%x][0x%x][0x%x]\n", nvp6158_chip_id[0],
169
+			nvp6158_chip_id[1], nvp6158_chip_id[2], nvp6158_chip_id[3]);
170
+	printk("[NVP6158_DRV]Rev Id [0x%x][0x%x][0x%x][0x%x]\n", nvp6158_rev_id[0],
171
+			nvp6158_rev_id[1], nvp6158_rev_id[2], nvp6158_rev_id[3]);
175172 
176173 	ret = nvp6158_cnt;
177174 
....@@ -196,22 +193,19 @@
196193 
197194 	printk("[NVP6158_DRV] %s(%d) \n", __func__, __LINE__);
198195 	/* initialize common value of AHD */
199
-	for(chip=0;chip<nvp6158_cnt;chip++)
200
-	{
196
+	for(chip = 0; chip < nvp6158_cnt; chip++) {
201197 		nvp6158_common_init(chip);
202
-		if(nvp6158_chip_id[chip]==NVP6158C_R0_ID || nvp6158_chip_id[chip]==NVP6158_R0_ID)
198
+		if(nvp6158_chip_id[chip] == NVP6158C_R0_ID || nvp6158_chip_id[chip] == NVP6158_R0_ID) {
203199 			nvp6158_additional_for3MoverDef(chip);
204
-		else
205
-		{
200
+		} else {
206201 			gpio_i2c_write(nvp6158_iic_addr[chip], 0xff, 0x01 );
207202 			gpio_i2c_write(nvp6158_iic_addr[chip], 0x97, 0x00); // CH_RST ON
208203 			gpio_i2c_write(nvp6158_iic_addr[chip], 0x97, 0x0f); // CH_RST OFF
209204 			gpio_i2c_write(nvp6158_iic_addr[chip], 0x7a, 0x0f); // Clock Auto ON
210205 			gpio_i2c_write(nvp6158_iic_addr[chip], 0xca, 0xff); // VCLK_EN, VDO_EN
211206 
212
-			for(ch=0; ch<4; ch++)
213
-			{
214
-				gpio_i2c_write(nvp6158_iic_addr[chip], 0xff, 0x05 +ch);
207
+			for(ch = 0; ch < 4; ch++) {
208
+				gpio_i2c_write(nvp6158_iic_addr[chip], 0xff, 0x05 + ch);
215209 				gpio_i2c_write(nvp6158_iic_addr[chip], 0x00, 0xd0);
216210 
217211 				gpio_i2c_write(nvp6158_iic_addr[chip], 0x05, 0x04);
....@@ -290,44 +284,36 @@
290284 		}
291285 	}
292286 
293
-	for(ch=0;ch<nvp6158_cnt*4;ch++)
294
-	{
287
+	for(ch = 0; ch < nvp6158_cnt * 4; ch++) {
295288 		nvp6158_det_mode[ch] = NVP6158_DET_MODE_AUTO;
296
-		vin_auto_det.ch = ch%4;
297
-		vin_auto_det.devnum = ch/4;
289
+		vin_auto_det.ch = ch % 4;
290
+		vin_auto_det.devnum = ch / 4;
298291 	#ifdef _NVP6168_USE_MANUAL_MODE_
299
-		vin_manual_det.ch = ch%4;
300
-		vin_manual_det.dev_num = ch/4;
292
+		vin_manual_det.ch = ch % 4;
293
+		vin_manual_det.dev_num = ch / 4;
301294 	#endif
302
-		if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID)
303
-		{
295
+		if(nvp6158_chip_id[0] == NVP6158C_R0_ID || nvp6158_chip_id[0] == NVP6158_R0_ID) {
304296 			nvp6158_video_input_auto_detect_set(&vin_auto_det);
305297 			nvp6158_set_chnmode(ch, NC_VIVO_CH_FORMATDEF_UNKNOWN);
306
-		}
307
-		else
308
-		{	
298
+		} else {
309299 			nvp6168_video_input_auto_detect_set(&vin_auto_det);
310300 		#ifdef _NVP6168_USE_MANUAL_MODE_
311301 			nvp6168_video_input_manual_mode_set(&vin_manual_det);
312302 		#endif
313
-			nvp6168_set_chnmode(ch, NC_VIVO_CH_FORMATDEF_UNKNOWN);	 
303
+			nvp6168_set_chnmode(ch, NC_VIVO_CH_FORMATDEF_UNKNOWN);
314304 		}
315305 	}
316306 
317
-	for(chip=0;chip<nvp6158_cnt;chip++)
318
-	{
319
-		if(nvp6158_chip_id[chip] == NVP6158_R0_ID || nvp6158_chip_id[chip] == NVP6168_R0_ID)
320
-		{
307
+	for(chip = 0; chip < nvp6158_cnt; chip++) {
308
+		if(nvp6158_chip_id[chip] == NVP6158_R0_ID || nvp6158_chip_id[chip] == NVP6168_R0_ID) {
321309 			//set nvp6158 output mode of 4port, 0~3 port is available
322
-			nvp6158_set_portmode(chip, 0, NVP6158_OUTMODE_1MUX_FHD, 0);  
310
+			nvp6158_set_portmode(chip, 0, NVP6158_OUTMODE_1MUX_FHD, 0);
323311 			nvp6158_set_portmode(chip, 1, NVP6158_OUTMODE_1MUX_FHD, 1);
324312 			nvp6158_set_portmode(chip, 2, NVP6158_OUTMODE_1MUX_FHD, 2);
325313 			nvp6158_set_portmode(chip, 3, NVP6158_OUTMODE_1MUX_FHD, 3);
326
-		}
327
-		else //if(nvp6158_chip_id[chip] == NVP6158C_R0_ID)
328
-		{
314
+		} else {//if(nvp6158_chip_id[chip] == NVP6158C_R0_ID)
329315 			//set nvp6158C output mode of 2port, 1/2 port is available
330
-			nvp6158_set_portmode(chip, 1, NVP6158_OUTMODE_2MUX_FHD, 0);  
316
+			nvp6158_set_portmode(chip, 1, NVP6158_OUTMODE_2MUX_FHD, 0);
331317 			nvp6158_set_portmode(chip, 2, NVP6158_OUTMODE_2MUX_FHD, 1);
332318 		}
333319 	}
....@@ -340,7 +326,7 @@
340326 	printk("[DRV] Nvp6158 Driver Open\n");
341327 	printk("[DRV] Nvp6158 Driver Ver::%s\n", NVP6158_DRIVER_VER);
342328 	return 0;
343
-} 
329
+}
344330 
345331 int nvp6158_close(struct inode * inode, struct file * file)
346332 {
....@@ -373,23 +359,22 @@
373359 	/* you must skip other command to improve speed of f/w update
374360 	 * when you are updating cam's f/w up. we need to review and test */
375361 	//if( acp_dvr_checkFWUpdateStatus( cmd ) == -1 )
376
-	{
362
+	//{
377363 		//printk(">>>>> DRV[%s:%d] Now cam f/w update mode. so Skip other command.\n", __func__, __LINE__ );
378364 		//return 0;
379
-	}
365
+	//}
380366 	down(&nvp6158_lock);
381
-	switch (cmd)
382
-	{
367
+	switch (cmd) {
383368 		case IOC_VDEC_SET_I2C : // nextchip demoboard test
384
-			if (copy_from_user(&i2c, argp, sizeof(nvp6124_i2c_mode))) {up(&nvp6158_lock);return -1;}
369
+			if (copy_from_user(&i2c, argp, sizeof(nvp6124_i2c_mode))) {
370
+				up(&nvp6158_lock);
371
+				return -1;
372
+			}
385373 
386
-			if(i2c.flag == 0) // read
387
-			{
374
+			if(i2c.flag == 0) {// read
388375 				gpio_i2c_write(i2c.slaveaddr, 0xFF, i2c.bank);
389376 				i2c.data = gpio_i2c_read(i2c.slaveaddr, i2c.address);
390
-			}
391
-			else //write
392
-			{
377
+			} else {//write
393378 				gpio_i2c_write(i2c.slaveaddr, 0xFF, i2c.bank);
394379 				gpio_i2c_write(i2c.slaveaddr, i2c.address, i2c.data);
395380 			}
....@@ -402,20 +387,26 @@
402387 				printk("IOC_VDEC_GET_VIDEO_LOSS error\n");
403388 			break;
404389 		case IOC_VDEC_GET_EQ_DIST:
405
-        		if (copy_from_user(&s_eq_dist, argp, sizeof(video_equalizer_info_s))) {up(&nvp6158_lock);return -1;}
406
-					
390
+        		if (copy_from_user(&s_eq_dist, argp, sizeof(video_equalizer_info_s))) {
391
+				up(&nvp6158_lock);
392
+				return -1;
393
+			}
394
+
407395 			s_eq_dist.distance = nvp6158_get_eq_dist(&s_eq_dist);
408396 			if(copy_to_user(argp, &s_eq_dist, sizeof(video_equalizer_info_s)))
409397 				printk("IOC_VDEC_GET_EQ_DIST error\n");
410
-			break;	
398
+			break;
411399 		case IOC_VDEC_SET_EQUALIZER:
412
-			if (copy_from_user(&s_eq_dist, argp, sizeof(video_equalizer_info_s))) {up(&nvp6158_lock);return -1;}
413
-			if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID)
414
-				nvp6158_set_equalizer(&s_eq_dist);	
400
+			if (copy_from_user(&s_eq_dist, argp, sizeof(video_equalizer_info_s))) {
401
+				up(&nvp6158_lock);
402
+				return -1;
403
+			}
404
+			if(nvp6158_chip_id[0] == NVP6158C_R0_ID || nvp6158_chip_id[0] == NVP6158_R0_ID)
405
+				nvp6158_set_equalizer(&s_eq_dist);
415406 			else
416407 				nvp6168_set_equalizer(&s_eq_dist);
417408 			break;
418
-		case IOC_VDEC_GET_DRIVERVER:			
409
+		case IOC_VDEC_GET_DRIVERVER:
419410 			if(copy_to_user(argp, &NVP6158_DRIVER_VER, sizeof(NVP6158_DRIVER_VER)))
420411 				printk("IOC_VDEC_GET_DRIVERVER error\n");
421412 			break;
....@@ -428,11 +419,11 @@
428419 			{
429420 				ispdata.data = acp_isp_read(ispdata.ch, ispdata.addr);
430421 				if(copy_to_user(argp, &ispdata, sizeof(nvp6158_acp_rw_data)))
431
-					printk("IOC_VDEC_ACP_WRITE error\n");	
422
+					printk("IOC_VDEC_ACP_WRITE error\n");
432423 			}*/
433424 			break;
434425 		case IOC_VDEC_ACP_WRITE_EXTENTION:
435
-			
426
+
436427 			break;
437428 		case IOC_VDEC_PTZ_ACP_READ:
438429 			//if (copy_from_user(&vfmt, argp, sizeof(nvp6158_input_videofmt)))
....@@ -445,15 +436,17 @@
445436 					//if(((nvp6158_g_vloss>>i)&0x01) == 0x00)
446437 					//	acp_read(&vfmt, i);
447438 			//	}
448
-			//}							
439
+			//}
449440 			//if(copy_to_user(argp, &vfmt, sizeof(nvp6158_input_videofmt)))
450
-			//	printk("IOC_VDEC_PTZ_ACP_READ error\n");			
451
-			break;	
441
+			//	printk("IOC_VDEC_PTZ_ACP_READ error\n");
442
+			break;
452443 		case IOC_VDEC_PTZ_ACP_READ_EACH_CH:
453
-			if (copy_from_user(&vfmt_ch, argp, sizeof(nvp6158_input_videofmt_ch))) {up(&nvp6158_lock);return -1;}
444
+			if (copy_from_user(&vfmt_ch, argp, sizeof(nvp6158_input_videofmt_ch))) {
445
+				up(&nvp6158_lock);
446
+				return -1;
447
+			}
454448 			/* read A-CP */
455
-			if(((nvp6158_g_vloss>>vfmt_ch.ch)&0x01) == 0x00)
456
-			{
449
+			if(((nvp6158_g_vloss>>vfmt_ch.ch) & 0x01) == 0x00) {
457450 				//acp_read(&vfmt_ch.vfmt, vfmt_ch.ch);
458451 			}
459452 
....@@ -461,61 +454,84 @@
461454 				printk("IOC_VDEC_PTZ_ACP_READ_EACH_CH error\n");
462455 			break;
463456 		case IOC_VDEC_GET_INPUT_VIDEO_FMT:
464
-			if (copy_from_user(&vfmt, argp, sizeof(NVP6158_INFORMATION_S))) {up(&nvp6158_lock);return -1;}
465
-			if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID)
457
+			if (copy_from_user(&vfmt, argp, sizeof(NVP6158_INFORMATION_S))) {
458
+				up(&nvp6158_lock);
459
+				return -1;
460
+			}
461
+			if(nvp6158_chip_id[0] == NVP6158C_R0_ID || nvp6158_chip_id[0] == NVP6158_R0_ID)
466462 				nvp6158_video_fmt_det(vfmt.ch, &vfmt);
467463 			else
468464 				nvp6168_video_fmt_det(vfmt.ch, &vfmt);
469465 			if(copy_to_user(argp, &vfmt, sizeof(NVP6158_INFORMATION_S)))
470466 				printk("IOC_VDEC_GET_INPUT_VIDEO_FMT error\n");
471
-			break;	
467
+			break;
472468 		case IOC_VDEC_SET_CHDETMODE:
473
-            if (copy_from_user(&nvp6158_det_mode, argp, sizeof(unsigned char)*16)) {up(&nvp6158_lock);return -1;}
474
-			
475
-			for(i=0;i<(nvp6158_cnt*4);i++)
476
-			{
477
-				printk("IOC_VDEC_SET_CHNMODE nvp6158_det_mode[%d]==%d\n", i, nvp6158_det_mode[i]);
478
-				if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID)
469
+			if (copy_from_user(&nvp6158_det_mode, argp, sizeof(unsigned char) * 16)) {
470
+				up(&nvp6158_lock);
471
+				return -1;
472
+			}
473
+			for(i = 0; i<(nvp6158_cnt * 4); i++) {
474
+				printk("IOC_VDEC_SET_CHNMODE nvp6158_det_mode[%d]==%d\n",
475
+						i, nvp6158_det_mode[i]);
476
+				if(nvp6158_chip_id[0] == NVP6158C_R0_ID || nvp6158_chip_id[0] == NVP6158_R0_ID)
479477 					nvp6158_set_chnmode(i, NC_VIVO_CH_FORMATDEF_UNKNOWN);
480478 				else
481479 					nvp6168_set_chnmode(i, NC_VIVO_CH_FORMATDEF_UNKNOWN);
482480 			}
483
-			break;	
481
+			break;
484482 		case IOC_VDEC_SET_CHNMODE:
485
-            if (copy_from_user(&schnmode, argp, sizeof(nvp6158_chn_mode))) {up(&nvp6158_lock);return -1;}
486
-			if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID)
487
-			{
483
+			if (copy_from_user(&schnmode, argp, sizeof(nvp6158_chn_mode))) {
484
+				up(&nvp6158_lock);
485
+				return -1;
486
+			}
487
+			if(nvp6158_chip_id[0] == NVP6158C_R0_ID || nvp6158_chip_id[0] == NVP6158_R0_ID) {
488488 				if(0 == nvp6158_set_chnmode(schnmode.ch, schnmode.chmode))
489489 					printk("IOC_VDEC_SET_CHNMODE OK\n");
490
-			}
491
-			else
492
-			{
490
+			} else {
493491 				if(0 == nvp6168_set_chnmode(schnmode.ch, schnmode.chmode))
494492 					printk("IOC_VDEC_SET_CHNMODE OK\n");
495493 			}
496494 			break;
497495 		case IOC_VDEC_SET_OUTPORTMODE:
498
-            		if(copy_from_user(&optmode, argp, sizeof(nvp6158_opt_mode))) {up(&nvp6158_lock);return -1;}
496
+            		if(copy_from_user(&optmode, argp, sizeof(nvp6158_opt_mode))) {
497
+				up(&nvp6158_lock);
498
+				return -1;
499
+			}
499500 			nvp6158_set_portmode(optmode.chipsel, optmode.portsel, optmode.portmode, optmode.chid);
500
-			break;	
501
+			break;
501502 		case IOC_VDEC_SET_BRIGHTNESS:
502
-            		if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {up(&nvp6158_lock);return -1;}
503
+            		if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {
504
+				up(&nvp6158_lock);
505
+				return -1;
506
+			}
503507 			//nvp6158_video_set_brightness(v_adj.ch, v_adj.value, nvp6158_ch_vfmt_status[v_adj.ch]);
504508 			break;
505509 		case IOC_VDEC_SET_CONTRAST:
506
-			if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {up(&nvp6158_lock);return -1;}
510
+			if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {
511
+				up(&nvp6158_lock);
512
+				return -1;
513
+			}
507514 			//nvp6158_video_set_contrast(v_adj.ch, v_adj.value, nvp6158_ch_vfmt_status[v_adj.ch]);
508515 			break;
509516 		case IOC_VDEC_SET_HUE:
510
-			if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {up(&nvp6158_lock);return -1;}
517
+			if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {
518
+				up(&nvp6158_lock);
519
+				return -1;
520
+			}
511521 			//nvp6158_video_set_hue(v_adj.ch, v_adj.value, nvp6158_ch_vfmt_status[v_adj.ch]);
512522 			break;
513523 		case IOC_VDEC_SET_SATURATION:
514
-			if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {up(&nvp6158_lock);return -1;}
524
+			if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {
525
+				up(&nvp6158_lock);
526
+				return -1;
527
+			}
515528 			//nvp6158_video_set_saturation(v_adj.ch, v_adj.value, nvp6158_ch_vfmt_status[v_adj.ch]);
516529 			break;
517530 		case IOC_VDEC_SET_SHARPNESS:
518
-			if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {up(&nvp6158_lock);return -1;}
531
+			if(copy_from_user(&v_adj, argp, sizeof(nvp6158_video_adjust))) {
532
+				up(&nvp6158_lock);
533
+				return -1;
534
+			}
519535 			nvp6158_video_set_sharpness(v_adj.ch, v_adj.value);
520536 			break; 
521537 		/*----------------------- Coaxial Protocol ----------------------*/
....@@ -541,7 +557,7 @@
541557 				break;
542558 			case IOC_VDEC_COAX_TX_CVI_NEW_CMD_SEND: //SK_CHANGE 170703
543559 				if(copy_from_user(&coax_val, argp, sizeof(nvp6158_coax_str)))
544
-						printk(" IOC_VDEC_COAX_TX_CMD_SEND error\n");
560
+					printk(" IOC_VDEC_COAX_TX_CMD_SEND error\n");
545561 				nvp6158_coax_tx_cvi_new_cmd_send(&coax_val);
546562 					break;
547563 		case IOC_VDEC_COAX_RX_INIT:
....@@ -575,55 +591,55 @@
575591 		/*=========== Coaxial Protocol Firmware Update ==============*/
576592 		case IOC_VDEC_COAX_FW_ACP_HEADER_GET:
577593 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
578
-							printk("IOC_VDEC_COAX_FW_READY_CMD_SET error\n");
594
+				printk("IOC_VDEC_COAX_FW_READY_CMD_SET error\n");
579595 			nvp6158_coax_fw_ready_header_check_from_isp_recv(&coax_fw_val);
580596 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
581597 			break;
582598 		case IOC_VDEC_COAX_FW_READY_CMD_SET:
583599 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
584
-							printk("IOC_VDEC_COAX_FW_READY_CMD_SET error\n");
600
+				printk("IOC_VDEC_COAX_FW_READY_CMD_SET error\n");
585601 			nvp6158_coax_fw_ready_cmd_to_isp_send(&coax_fw_val);
586602 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
587603 			break;
588604 		case IOC_VDEC_COAX_FW_READY_ACK_GET:
589605 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
590
-							printk("IOC_VDEC_COAX_FW_READY_ISP_STATUS_GET error\n");
606
+				printk("IOC_VDEC_COAX_FW_READY_ISP_STATUS_GET error\n");
591607 			nvp6158_coax_fw_ready_cmd_ack_from_isp_recv(&coax_fw_val);
592608 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
593609 			break;
594610 		case IOC_VDEC_COAX_FW_START_CMD_SET:
595611 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
596
-							printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
612
+				printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
597613 			nvp6158_coax_fw_start_cmd_to_isp_send(&coax_fw_val);
598614 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
599615 			break;
600616 		case IOC_VDEC_COAX_FW_START_ACK_GET:
601617 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
602
-							printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
618
+				printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
603619 			nvp6158_coax_fw_start_cmd_ack_from_isp_recv(&coax_fw_val);
604620 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
605621 			break;
606622 		case IOC_VDEC_COAX_FW_SEND_DATA_SET:
607623 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
608
-							printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
624
+				printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
609625 			nvp6158_coax_fw_one_packet_data_to_isp_send(&coax_fw_val);
610626 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
611627 			break;
612628 		case IOC_VDEC_COAX_FW_SEND_ACK_GET:
613629 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
614
-							printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
630
+				printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
615631 			nvp6158_coax_fw_one_packet_data_ack_from_isp_recv(&coax_fw_val);
616632 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
617633 			break;
618634 		case IOC_VDEC_COAX_FW_END_CMD_SET:
619635 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
620
-							printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
636
+				printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
621637 			nvp6158_coax_fw_end_cmd_to_isp_send(&coax_fw_val);
622638 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
623639 			break;
624640 		case IOC_VDEC_COAX_FW_END_ACK_GET:
625641 			if(copy_from_user(&coax_fw_val, argp, sizeof(FIRMWARE_UP_FILE_INFO)))
626
-							printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
642
+				printk("IOC_VDEC_COAX_FW_START_CMD_SET error\n");
627643 			nvp6158_coax_fw_end_cmd_ack_from_isp_recv(&coax_fw_val);
628644 			cpy2usr_ret = copy_to_user(argp, &coax_fw_val, sizeof(FIRMWARE_UP_FILE_INFO));
629645 			break;
....@@ -681,13 +697,11 @@
681697 	int chip = 0;
682698 
683699 	printk("[NVP6158_DRV] %s(%d) \n", __func__, __LINE__);
684
-	for(ch=0;ch<nvp6158_cnt*4;ch++)
685
-	{
686
-		nvp6158_set_chnmode(ch, AHD20_1080P_30P); 
700
+	for(ch = 0; ch < nvp6158_cnt * 4; ch++) {
701
+		nvp6158_set_chnmode(ch, AHD20_1080P_30P);
687702 	}
688703 
689
-	for(chip=0;chip<nvp6158_cnt;chip++)
690
-	{
704
+	for(chip = 0; chip < nvp6158_cnt; chip++) {
691705 		nvp6158_set_portmode(chip, 1, NVP6158_OUTMODE_1MUX_FHD, 0);
692706 		nvp6158_set_portmode(chip, 2, NVP6158_OUTMODE_1MUX_FHD, 1);
693707 	}
....@@ -712,13 +726,11 @@
712726 	int chip = 0;
713727 
714728 	printk("[NVP6158_DRV] %s(%d) \n", __func__, __LINE__);
715
-	for(ch=0;ch<nvp6158_cnt*4;ch++)
716
-	{
717
-		nvp6158_set_chnmode(ch, AHD20_720P_30P); 
729
+	for(ch = 0; ch < nvp6158_cnt * 4; ch++) {
730
+		nvp6158_set_chnmode(ch, AHD20_720P_30P);
718731 	}
719732 
720
-	for(chip=0;chip<nvp6158_cnt;chip++)
721
-	{
733
+	for(chip = 0; chip < nvp6158_cnt; chip ++) {
722734 		nvp6158_set_portmode(chip, 1, NVP6158_OUTMODE_1MUX_BT1120S_720P, 1);
723735 		nvp6158_set_portmode(chip, 2, NVP6158_OUTMODE_1MUX_BT1120S_720P, 1);
724736 	}
....@@ -730,13 +742,11 @@
730742 	int chip = 0;
731743 
732744 	printk("[NVP6158_DRV] %s(%d) \n", __func__, __LINE__);
733
-	for(ch=0;ch<nvp6158_cnt*4;ch++)
734
-	{
735
-		nvp6158_set_chnmode(ch, AHD20_1080P_30P); 
745
+	for(ch = 0; ch < nvp6158_cnt * 4; ch++) {
746
+		nvp6158_set_chnmode(ch, AHD20_1080P_30P);
736747 	}
737748 
738
-	for(chip=0;chip<nvp6158_cnt;chip++)
739
-	{
749
+	for(chip = 0; chip < nvp6158_cnt; chip++) {
740750 		nvp6158_set_portmode(chip, 1, NVP6158_OUTMODE_1MUX_BT1120S_1080P, 0);
741751 		nvp6158_set_portmode(chip, 2, NVP6158_OUTMODE_1MUX_BT1120S_1080P, 0);
742752 	}
....@@ -756,13 +766,12 @@
756766 	nvp6158_video_decoder_init();
757767 	/* initialize Audio
758768 	 * recmaster, pbmaster, ch_num, samplerate, bits */
759
-	if(nvp6158_chip_id[0]==NVP6158C_R0_ID || nvp6158_chip_id[0]==NVP6158_R0_ID)
769
+	if(nvp6158_chip_id[0] == NVP6158C_R0_ID || nvp6158_chip_id[0] == NVP6158_R0_ID)
760770 		nvp6158_audio_init(1,0,16,0,0);
761771 	else
762772 		nvp6168_audio_init(1,0,16,0,0);
763773 
764
-	switch (fmt_idx)
765
-	{
774
+	switch (fmt_idx) {
766775 		/* normal output */
767776 		case AHD20_720P_25P:
768777 			for (ch = 0; ch < nvp6158_cnt * 4; ch++)
....@@ -833,16 +842,15 @@
833842 			break;
834843 		default:
835844 			for (ch = 0; ch < nvp6158_cnt * 4; ch++)
836
-				nvp6158_set_chnmode(ch, AHD20_1080P_30P); 
837
-			break;	
845
+				nvp6158_set_chnmode(ch, AHD20_1080P_30P);
846
+			break;
838847 	}
839848 
840849 	nvp6158_set_colorpattern();
841850 	//nvp6158_set_colorpattern2();
842851 	//nvp6158_set_colorpattern3();
843852 
844
-	switch (mode)
845
-	{
853
+	switch (mode) {
846854 		/* normal output */
847855 		case BT656_1MUX:
848856 			if ((fmt_idx == AHD20_1080P_25P) || (fmt_idx == AHD20_1080P_30P)) {
....@@ -970,7 +978,7 @@
970978 			break;
971979 		default:
972980 			printk("mode %d not supported yet\n", mode);
973
-			break;	
981
+			break;
974982 	}
975983 	up(&nvp6158_lock);
976984 }
....@@ -984,7 +992,7 @@
984992 	gpio_i2c_write(0x60, 0xFF, 0x01);
985993 	gpio_i2c_write(0x60, 0xCA, 0x00);
986994 
987
-	for(ch=0;ch < 4;ch++) {
995
+	for(ch = 0; ch < 4;ch++) {
988996 		nvp6158_channel_reset(ch);
989997 	}
990998 	up(&nvp6158_lock);
....@@ -1004,7 +1012,7 @@
10041012     printk("[DRV] I2C Client Init \n");
10051013     i2c_adap = i2c_get_adapter(i2c_bus);
10061014 
1007
-    nvp6158_client = i2c_new_device(i2c_adap, &nvp6158_hi_info);
1015
+    nvp6158_client = i2c_new_client_device(i2c_adap, &nvp6158_hi_info);
10081016     i2c_put_adapter(i2c_adap);
10091017 
10101018     return 0;