update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/i2c/nvp6158_drv/nvp6158_audio.c
..
..
@@ -19,16 +19,15 @@
19
19
 #include "nvp6158_common.h"
20
20
 #include "nvp6158_audio.h"
21
21
 
22
-
23
22
 /*******************************************************************************
24
23
  * extern variable
25
24
  *******************************************************************************/
26
-extern int 				nvp6158_chip_id[4];				/* Chip ID */
27
-extern int 				nvp6158_rev_id[4];				/* Reversion ID */
28
-static int g_ai_type = NC_AD_AI;
29
-static int g_aud_sample = NC_AD_SAMPLE_RATE_8000;
30
-extern unsigned int 	nvp6158_cnt;			/* Chip count */
31
-extern unsigned int 	nvp6158_iic_addr[4];	/* Slave address of Chip */
25
+extern int	nvp6158_chip_id[4];	/* Chip ID */
26
+extern int	nvp6158_rev_id[4];	/* Reversion ID */
27
+static int	g_ai_type = NC_AD_AI;
28
+static int	g_aud_sample = NC_AD_SAMPLE_RATE_8000;
29
+extern unsigned int	nvp6158_cnt;	/* Chip count */
30
+extern unsigned int	nvp6158_iic_addr[4];	/* Slave address of Chip */
32
31
 
33
32
 /*******************************************************************************
34
33
 *	Description		: initialize audio
..
..
@@ -45,55 +44,46 @@
45
44
 *		- bits: 0[16bits], 1[8bits]
46
45
 *
47
46
 *******************************************************************************/
48
-void nvp6158_audio_init(unsigned char recmaster, unsigned char pbmaster, unsigned char ch_num, unsigned char samplerate, unsigned char bits)
47
+void nvp6158_audio_init(unsigned char recmaster, unsigned char pbmaster,
48
+			unsigned char ch_num, unsigned char samplerate, unsigned char bits)
49
49
 {
50
50
 	int i;
51
51
 	unsigned char val_1x39;
52
-	for(i=0;i<nvp6158_cnt;i++)
53
-	{
52
+	for(i=0; i<nvp6158_cnt; i++) {
54
53
 		gpio_i2c_write(nvp6158_iic_addr[i], 0xFF, 0x01);
55
54
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x94, 0x00);
56
55
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x00, 0x02);
57
56
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x08, 0x03);  //I2s outputs 16ch audio
58
-		if(ch_num == 16)  // 4chips' audio cascade
59
-		{
57
+		if(ch_num == 16) { // 4chips' audio cascade
60
58
 			if(0 == i)
61
59
 				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x3A);  //first stage
62
60
 			else if(1 == i)
63
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x38);  //middle stage	
61
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x38);  //middle stage
64
62
 			else if(2 == i)
65
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x38);  //middle stage		
63
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x38);  //middle stage	
66
64
 			else if(3 == i)
67
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x39);  //last stage		
68
-		}
69
-		else if(ch_num == 8)
70
-		{
71
-			if(0 == i)
72
-			{
65
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x39);  //last stage	
66
+		} else if(ch_num == 8) {
67
+			if(0 == i) {
73
68
 				gpio_i2c_write(nvp6158_iic_addr[i], 0x08, 0x02);  //I2s outputs 8ch audio
74
69
 				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x3A);  //first stage
75
-			}
76
-			else if(1 == i)
77
-			{
78
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x39);  //last stage	
79
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x0f, 0x54);    //set I2S right sequence
70
+			} else if(1 == i) {
71
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x39);  //last stage
72
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x0f, 0x54);  //set I2S right sequence
80
73
 				gpio_i2c_write(nvp6158_iic_addr[i], 0x10, 0x76);
81
74
 			}
82
-		}	
83
-		else
84
-		{
75
+		} else {
85
76
 			gpio_i2c_write(nvp6158_iic_addr[i], 0x08, 0x01);  //I2s outputs 4ch audio, left & right each 2 channels
86
77
 			gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x3B);  //first stage
87
-			gpio_i2c_write(nvp6158_iic_addr[i], 0x0f, 0x32);    //set I2S right sequence
78
+			gpio_i2c_write(nvp6158_iic_addr[i], 0x0f, 0x32);  //set I2S right sequence
88
79
 		}
89
-		gpio_i2c_write(nvp6158_iic_addr[i], 0x07, 0x00|(recmaster<<7)|(samplerate<<3)|(bits<<2));
90
-		if(recmaster == 0)
91
-		{
80
+		gpio_i2c_write(nvp6158_iic_addr[i], 0x07, 0x00 | (recmaster << 7) | (samplerate << 3) | (bits <<2 ));
81
+		if(recmaster == 0) {
92
82
 			val_1x39 = gpio_i2c_read(nvp6158_iic_addr[i], 0x39);
93
83
 			val_1x39 |= 0x80;
94
84
 			gpio_i2c_write(nvp6158_iic_addr[i], 0x39, val_1x39);
95
85
 		}
96
-		gpio_i2c_write(nvp6158_iic_addr[i], 0x13, 0x00|(pbmaster<<7)|(samplerate<<3)|(bits<<2));
86
+		gpio_i2c_write(nvp6158_iic_addr[i], 0x13, 0x00 | (pbmaster << 7) | (samplerate << 3) | (bits << 2));
97
87
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x01, 0x09);
98
88
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x02, 0x09);
99
89
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x03, 0x09);
..
..
@@ -116,47 +106,39 @@
116
106
 	}
117
107
 }
118
108
 
119
-void nvp6168_audio_init(unsigned char recmaster, unsigned char pbmaster, unsigned char ch_num, unsigned char samplerate, unsigned char bits)
109
+void nvp6168_audio_init(unsigned char recmaster, unsigned char pbmaster,
110
+			unsigned char ch_num, unsigned char samplerate, unsigned char bits)
120
111
 {
121
112
 	int i;
122
-	for(i=0;i<nvp6158_cnt;i++)
123
-	{
113
+	for(i=0; i<nvp6158_cnt; i++) {
124
114
 		gpio_i2c_write(nvp6158_iic_addr[i], 0xFF, 0x01);
125
115
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x94, 0x00);
126
116
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x08, 0x03);  //I2s outputs 16ch audio
127
-		if(ch_num == 16)  // 4chips' audio cascade
128
-		{
117
+		if(ch_num == 16) { // 4chips' audio cascade
129
118
 			if(0 == i)
130
119
 				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x1A);  //first stage
131
120
 			else if(1 == i)
132
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x18);  //middle stage	
121
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x18);  //middle stage
133
122
 			else if(2 == i)
134
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x18);  //middle stage		
123
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x18);  //middle stage	
135
124
 			else if(3 == i)
136
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x19);  //last stage		
137
-		}
138
-		else if(ch_num == 8)
139
-		{
140
-			if(0 == i)
141
-			{
125
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x19);  //last stage
126
+		} else if(ch_num == 8) {
127
+			if(0 == i) {
142
128
 				gpio_i2c_write(nvp6158_iic_addr[i], 0x08, 0x02);  //I2s outputs 8ch audio
143
129
 				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x1A);  //first stage
144
-			}
145
-			else if(1 == i)
146
-			{
147
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x19);  //last stage	
148
-				gpio_i2c_write(nvp6158_iic_addr[i], 0x0f, 0x54);    //set I2S right sequence
130
+			} else if(1 == i) {
131
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x19);  //last stage
132
+				gpio_i2c_write(nvp6158_iic_addr[i], 0x0f, 0x54);  //set I2S right sequence
149
133
 				gpio_i2c_write(nvp6158_iic_addr[i], 0x10, 0x76);
150
134
 			}
151
-		}	
152
-		else
153
-		{
135
+		} else {
154
136
 			gpio_i2c_write(nvp6158_iic_addr[i], 0x08, 0x01);  //I2s outputs 4ch audio, left & right each 2 channels
155
137
 			gpio_i2c_write(nvp6158_iic_addr[i], 0x06, 0x1B);  //first stage
156
-			gpio_i2c_write(nvp6158_iic_addr[i], 0x0f, 0x32);    //set I2S right sequence
138
+			gpio_i2c_write(nvp6158_iic_addr[i], 0x0f, 0x32);  //set I2S right sequence
157
139
 		}
158
-		gpio_i2c_write(nvp6158_iic_addr[i], 0x07, 0x00|(recmaster<<7)|(samplerate<<3)|(bits<<2));
159
-		gpio_i2c_write(nvp6158_iic_addr[i], 0x13, 0x00|(pbmaster<<7)|(samplerate<<3)|(bits<<2));
140
+		gpio_i2c_write(nvp6158_iic_addr[i], 0x07, 0x00 | (recmaster << 7) | (samplerate << 3) | (bits << 2));
141
+		gpio_i2c_write(nvp6158_iic_addr[i], 0x13, 0x00 | (pbmaster << 7) | (samplerate << 3) | (bits << 2));
160
142
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x01, 0x09);
161
143
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x02, 0x09);
162
144
 		gpio_i2c_write(nvp6158_iic_addr[i], 0x03, 0x09);
..
..
@@ -191,18 +173,15 @@
191
173
 	unsigned char val_1x00;
192
174
 	gpio_i2c_write(nvp6158_iic_addr[chip], 0xFF, 0x01);
193
175
 	val_1x00 = gpio_i2c_read(nvp6158_iic_addr[chip], 0x00);
194
-	gpio_i2c_write(nvp6158_iic_addr[chip], 0x00, (val_1x00|0xC0)); //bit7 AFE, bit6 DAC
176
+	gpio_i2c_write(nvp6158_iic_addr[chip], 0x00, (val_1x00 | 0xC0)); //bit7 AFE, bit6 DAC
195
177
 }
196
178
 
197
179
 void nvp6158_audio_in_type_set(int type)
198
180
 {
199
-	if(type < NC_AD_MAX)
200
-	{
181
+	if(type < NC_AD_MAX) {
201
182
 		printk("[%s] Change audio input type %d > %d\r\n", __func__, g_ai_type, type);
202
183
 		g_ai_type = type;
203
-	}
204
-	else
205
-	{
184
+	} else {
206
185
 		printk("[%s] Invalid argument %d\r\n", __func__, type);
207
186
 	}
208
187
 }
..
..
@@ -214,13 +193,10 @@
214
193
 
215
194
 void nvp6158_audio_sample_rate_set(int sample)
216
195
 {
217
-	if(sample < NC_AD_SAMPLE_RATE_MAX)
218
-	{
196
+	if(sample < NC_AD_SAMPLE_RATE_MAX) {
219
197
 		printk("[%s] Change audio sampling rate %d > %d\r\n", __func__, g_aud_sample, sample);
220
198
 		g_aud_sample = sample;
221
-	}
222
-	else
223
-	{
199
+	} else {
224
200
 		printk("[%s] Invalid argument %d\r\n", __func__, sample);
225
201
 	}
226
202
 }
..
..
@@ -249,16 +225,13 @@
249
225
 //		}
250
226
 
251
227
 	// Set audio input type
252
-	if(g_ai_type == NC_AD_AOC)
253
-	{
228
+	if(g_ai_type == NC_AD_AOC) {
254
229
 		gpio_i2c_write(nvp6158_iic_addr[devnum], 0x00, 0x00);
255
230
 		gpio_i2c_write(nvp6158_iic_addr[devnum], 0x31, 0x08);
256
231
 		gpio_i2c_write(nvp6158_iic_addr[devnum], 0x46, 0x00);
257
232
 		gpio_i2c_write(nvp6158_iic_addr[devnum], 0x58, 0x00);
258
233
 		gpio_i2c_write(nvp6158_iic_addr[devnum], 0x62, 0xFF);
259
-	}
260
-	else if(g_ai_type == NC_AD_AI)
261
-	{
234
+	} else if(g_ai_type == NC_AD_AI) {
262
235
 		gpio_i2c_write(nvp6158_iic_addr[devnum], 0x00, 0x02);
263
236
 		gpio_i2c_write(nvp6158_iic_addr[devnum], 0x31, 0x0A);
264
237
 		gpio_i2c_write(nvp6158_iic_addr[devnum], 0x46, 0x10);
..
..
@@ -273,8 +246,7 @@
273
246
 
274
247
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
275
248
 
276
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
277
-	{
249
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
278
250
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
279
251
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
280
252
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -304,9 +276,7 @@
304
276
 
305
277
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
306
278
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
307
-	}
308
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
309
-	{
279
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
310
280
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
311
281
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
312
282
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -345,8 +315,7 @@
345
315
 
346
316
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
347
317
 
348
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
349
-	{
318
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
350
319
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
351
320
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
352
321
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -376,9 +345,7 @@
376
345
 
377
346
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
378
347
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
379
-	}
380
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
381
-	{
348
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
382
349
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
383
350
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
384
351
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -417,8 +384,7 @@
417
384
 
418
385
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
419
386
 
420
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
421
-	{
387
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
422
388
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
423
389
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
424
390
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -448,9 +414,7 @@
448
414
 
449
415
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
450
416
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
451
-	}
452
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
453
-	{
417
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
454
418
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
455
419
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
456
420
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -489,8 +453,7 @@
489
453
 
490
454
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
491
455
 
492
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
493
-	{
456
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
494
457
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
495
458
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
496
459
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -520,9 +483,7 @@
520
483
 
521
484
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
522
485
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
523
-	}
524
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
525
-	{
486
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
526
487
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
527
488
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
528
489
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -561,8 +522,7 @@
561
522
 
562
523
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
563
524
 
564
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
565
-	{
525
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
566
526
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
567
527
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
568
528
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -592,9 +552,7 @@
592
552
 
593
553
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
594
554
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
595
-	}
596
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
597
-	{
555
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
598
556
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
599
557
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
600
558
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -633,8 +591,7 @@
633
591
 
634
592
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
635
593
 
636
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
637
-	{
594
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
638
595
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
639
596
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
640
597
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -664,9 +621,7 @@
664
621
 
665
622
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
666
623
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
667
-	}
668
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
669
-	{
624
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
670
625
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
671
626
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
672
627
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -705,8 +660,7 @@
705
660
 
706
661
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
707
662
 
708
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
709
-	{
663
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
710
664
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
711
665
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
712
666
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -736,9 +690,7 @@
736
690
 
737
691
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
738
692
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
739
-	}
740
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
741
-	{
693
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
742
694
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
743
695
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
744
696
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -777,8 +729,7 @@
777
729
 
778
730
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
779
731
 
780
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
781
-	{
732
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
782
733
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
783
734
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
784
735
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -808,9 +759,7 @@
808
759
 
809
760
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
810
761
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
811
-	}
812
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
813
-	{
762
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
814
763
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
815
764
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
816
765
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -849,8 +798,7 @@
849
798
 
850
799
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
851
800
 
852
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
853
-	{
801
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
854
802
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
855
803
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
856
804
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -880,9 +828,7 @@
880
828
 
881
829
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
882
830
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
883
-	}
884
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
885
-	{
831
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
886
832
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
887
833
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
888
834
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -921,8 +867,7 @@
921
867
 
922
868
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
923
869
 
924
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
925
-	{
870
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
926
871
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
927
872
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
928
873
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -952,9 +897,7 @@
952
897
 
953
898
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
954
899
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
955
-	}
956
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
957
-	{
900
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
958
901
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
959
902
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
960
903
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -993,8 +936,7 @@
993
936
 
994
937
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
995
938
 
996
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
997
-	{
939
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
998
940
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
999
941
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
1000
942
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -1024,9 +966,7 @@
1024
966
 
1025
967
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
1026
968
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
1027
-	}
1028
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
1029
-	{
969
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
1030
970
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1031
971
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
1032
972
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -1065,8 +1005,7 @@
1065
1005
 
1066
1006
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
1067
1007
 
1068
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
1069
-	{
1008
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
1070
1009
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1071
1010
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
1072
1011
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -1096,9 +1035,7 @@
1096
1035
 
1097
1036
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
1098
1037
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
1099
-	}
1100
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
1101
-	{
1038
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
1102
1039
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1103
1040
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
1104
1041
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x00);
..
..
@@ -1137,8 +1074,7 @@
1137
1074
 
1138
1075
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
1139
1076
 
1140
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
1141
-	{
1077
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
1142
1078
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1143
1079
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
1144
1080
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -1168,9 +1104,7 @@
1168
1104
 
1169
1105
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
1170
1106
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
1171
-	}
1172
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
1173
-	{
1107
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
1174
1108
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1175
1109
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
1176
1110
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -1209,8 +1143,7 @@
1209
1143
 
1210
1144
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
1211
1145
 
1212
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
1213
-	{
1146
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
1214
1147
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1215
1148
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
1216
1149
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -1240,9 +1173,7 @@
1240
1173
 
1241
1174
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
1242
1175
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
1243
-	}
1244
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
1245
-	{
1176
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
1246
1177
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1247
1178
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
1248
1179
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -1281,8 +1212,7 @@
1281
1212
 
1282
1213
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
1283
1214
 
1284
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
1285
-	{
1215
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
1286
1216
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1287
1217
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
1288
1218
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -1312,9 +1242,7 @@
1312
1242
 
1313
1243
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
1314
1244
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
1315
-	}
1316
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
1317
-	{
1245
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
1318
1246
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1319
1247
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x00);
1320
1248
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -1353,8 +1281,7 @@
1353
1281
 
1354
1282
 	gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0xFF, 0x12);
1355
1283
 
1356
-	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000)
1357
-	{
1284
+	if(g_aud_sample == NC_AD_SAMPLE_RATE_8000) {
1358
1285
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1359
1286
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
1360
1287
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -1384,9 +1311,7 @@
1384
1311
 
1385
1312
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x17 + (ch*0x40), 0x00);
1386
1313
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x19 + (ch*0x40), 0xA0);
1387
-	}
1388
-	else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000)
1389
-	{
1314
+	} else if(g_aud_sample == NC_AD_SAMPLE_RATE_16000) {
1390
1315
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x00 + (ch*0x40), 0x00);
1391
1316
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x01 + (ch*0x40), 0x03);
1392
1317
 		gpio_i2c_write(nvp6158_iic_addr[decoder_info->devnum], 0x02 + (ch*0x40), 0x10);
..
..
@@ -1421,8 +1346,7 @@
1421
1346
 
1422
1347
 void nvp6158_audio_set_aoc_format(decoder_dev_ch_info_s *decoder_info)
1423
1348
 {
1424
-	switch(decoder_info->fmt_def)
1425
-	{
1349
+	switch(decoder_info->fmt_def) {
1426
1350
 		// 1M
1427
1351
 		case AHD20_720P_25P_EX_Btype :
1428
1352
 			nvp6158_set_aoc_720_25p_ex_b(decoder_info);
..
..
@@ -1430,14 +1354,12 @@
1430
1354
 		case AHD20_720P_30P_EX_Btype :
1431
1355
 			nvp6158_set_aoc_720_30p_ex_b(decoder_info);
1432
1356
 			break;
1433
-
1434
1357
 		case AHD20_720P_50P :
1435
1358
 			nvp6158_set_aoc_720_50p(decoder_info);
1436
1359
 		case AHD20_720P_60P :
1437
1360
 			nvp6158_set_aoc_720_60p(decoder_info);
1438
1361
 			printk("[%s] Not supported yet. [0x%X] \r\n", __func__, decoder_info->fmt_def);
1439
1362
 			break;
1440
-
1441
1363
 			// 2M
1442
1364
 		case AHD20_1080P_25P :
1443
1365
 			nvp6158_set_aoc_1080_25p(decoder_info);
..
..
@@ -1445,7 +1367,6 @@
1445
1367
 		case AHD20_1080P_30P :
1446
1368
 			nvp6158_set_aoc_1080_30p(decoder_info);
1447
1369
 			break;
1448
-
1449
1370
 			// 3M
1450
1371
 		case AHD30_3M_25P :
1451
1372
 			nvp6158_set_aoc_3m_25p(decoder_info);
..
..
@@ -1453,7 +1374,6 @@
1453
1374
 			nvp6158_set_aoc_3m_30p(decoder_info);
1454
1375
 			printk("[%s] Not supported yet. [0x%X] \r\n", __func__, decoder_info->fmt_def);
1455
1376
 			break;
1456
-
1457
1377
 			// 4M
1458
1378
 		case AHD30_4M_25P :
1459
1379
 			nvp6158_set_aoc_4m_25p(decoder_info);
..
..
@@ -1463,7 +1383,6 @@
1463
1383
 			nvp6158_set_aoc_4m_15p(decoder_info);
1464
1384
 			printk("[%s] Not supported yet. [0x%X] \r\n", __func__, decoder_info->fmt_def);
1465
1385
 			break;
1466
-
1467
1386
 			// 5M
1468
1387
 		case AHD30_5M_12_5P :
1469
1388
 			nvp6158_set_aoc_5m_12_5p(decoder_info);
..
..
@@ -1471,13 +1390,11 @@
1471
1390
 			nvp6158_set_aoc_5m_20p(decoder_info);
1472
1391
 			printk("[%s] Not supported yet. [0x%X] \r\n", __func__, decoder_info->fmt_def);
1473
1392
 			break;
1474
-
1475
1393
 			// 5.3M
1476
1394
 		case AHD30_5_3M_20P :
1477
1395
 			nvp6158_set_aoc_5_3m_20p(decoder_info);
1478
1396
 			printk("[%s] Not supported yet. [0x%X] \r\n", __func__, decoder_info->fmt_def);
1479
1397
 			break;
1480
-
1481
1398
 			// 8M
1482
1399
 		case AHD30_8M_12_5P :
1483
1400
 			nvp6158_set_aoc_8m_12_5p(decoder_info);
..
..
@@ -1485,7 +1402,6 @@
1485
1402
 			nvp6158_set_aoc_8m_15p(decoder_info);
1486
1403
 			printk("[%s] Not supported yet. [0x%X] \r\n", __func__, decoder_info->fmt_def);
1487
1404
 			break;
1488
-
1489
1405
 		default :
1490
1406
 			printk("[%s] Not supported format [0x%X] \r\n", __func__, decoder_info->fmt_def);
1491
1407
 			break;