修复hp / spk自动切换

hc

2023-03-15 f8c23d1415aad662de5acfa33671b5d14d2c1300

 kernel/drivers/misc/nkio/nk_io_core.c
..
..
@@ -61,11 +61,8 @@
61
61
 {
62
62
 	struct device_node *node = pdev->dev.of_node;
63
63
 	struct nk_io_pdata *pdata;	
64
-	int gpio0, gpio1, gpio2, gpio3, reset_pin, ch342_reset;
65
64
 	int ret;
66
-        int lvds_index;
67
-        int i=0;
68
-        static int lvds_gpio[4] ;
65
+
69
66
 
70
67
 	enum of_gpio_flags flags;
71
68
 	
..
..
@@ -97,7 +94,7 @@
97
94
 			goto err;
98
95
 		}
99
96
 	}
100
-	
97
+#if 0	
101
98
 	//vcc3_io_en_gpio
102
99
 	ret = of_get_named_gpio_flags(node, "vcc3_io_en_gpio", 0, &flags);
103
100
 	if (ret < 0) {
..
..
@@ -117,7 +114,7 @@
117
114
 			goto err;
118
115
 		}
119
116
 	}
120
-
117
+#endif
121
118
         //vcc_12v_io
122
119
         ret = of_get_named_gpio_flags(node, "vcc_12v_io", 0, &flags);
123
120
         if (ret < 0) {
..
..
@@ -241,13 +238,13 @@
241
238
 	           if(ret < 0){
242
239
 	                   printk("%s() devm_gpio_request reset_4g_gpio request ERROR\n", __FUNCTION__);
243
240
 	           }
244
-	           ret = gpio_direction_output(pdata->reset_4g_gpio,0);
241
+	           ret = gpio_direction_output(pdata->reset_4g_gpio,1);
245
242
 	           if(ret < 0){
246
243
 	                   printk("%s() gpio_direction_input reset_4g_gpio set ERROR\n", __FUNCTION__);
247
244
 					   goto err;
248
245
 	           }
249
246
 			   	msleep(800);
250
-				ret = gpio_direction_output(pdata->reset_4g_gpio,1); 
247
+				ret = gpio_direction_output(pdata->reset_4g_gpio,0); 
251
248
 				if(ret < 0){
252
249
 						printk("%s() gpio_direction_input reset_4g_gpio set ERROR\n", __FUNCTION__);
253
250
 					
..
..
@@ -287,7 +284,24 @@
287
284
 	                   printk("%s() gpio_direction_output hp_en_gpio set ERROR\n", __FUNCTION__);
288
285
 	           }
289
286
 	   }
290
-	   
287
+#if 0		
288
+			      //pcie_power_en_gpio
289
+	   ret = of_get_named_gpio_flags(node, "pcie_power_en_gpio", 0, &flags);
290
+	   if (ret < 0) {
291
+	           printk("%s() Can not read property pcie_power_en_gpio\n", __FUNCTION__);
292
+	   } else {
293
+	           pdata->pcie_power_en_gpio = ret;
294
+
295
+	           ret = devm_gpio_request(&pdev->dev, pdata->pcie_power_en_gpio, "pcie_power_en_gpio");
296
+	           if(ret < 0){
297
+	                   printk("%s() devm_gpio_request pcie_power_en_gpio request ERROR\n", __FUNCTION__);
298
+	           }
299
+	           ret = gpio_direction_output(pdata->pcie_power_en_gpio,1);
300
+	           if(ret < 0){
301
+	                   printk("%s() gpio_direction_output pcie_power_en_gpio set ERROR\n", __FUNCTION__);
302
+	           }
303
+	   }
304
+#endif	   
291
305
 	      //wifi_power_en_gpio
292
306
 	   ret = of_get_named_gpio_flags(node, "wifi_power_en_gpio", 0, &flags);
293
307
 	   if (ret < 0) {
..
..
@@ -305,7 +319,7 @@
305
319
 	           }
306
320
 	   }
307
321
 
308
-
322
+/*
309
323
 	      //spk_out_gpio
310
324
 	   ret = of_get_named_gpio_flags(node, "spk_out_gpio", 0, &flags);
311
325
 	   if (ret < 0) {
..
..
@@ -322,6 +336,7 @@
322
336
 	                   printk("%s() gpio_direction_output spk_out_gpio set ERROR\n", __FUNCTION__);
323
337
 	           }
324
338
 	   }
339
+*/
325
340
 	   //air_mode_4g_gpio
326
341
 	   ret = of_get_named_gpio_flags(node, "air_mode_4g_gpio", 0, &flags);
327
342
 	   if (ret < 0) {
..
..
@@ -377,24 +392,42 @@
377
392
 		}
378
393
 	} 
379
394
   
380
-   //ch342_enable-gpio;
381
-	ret = of_get_named_gpio_flags(node, "ch342_power", 0, &flags);
395
+   //lcd_bk_en_gpio;
396
+	ret = of_get_named_gpio_flags(node, "lcd_bk_en_gpio", 0, &flags);
382
397
 	if (ret < 0) {
383
-		printk("%s() Can not read property ch342_gpio\n", __FUNCTION__);
398
+		printk("%s() Can not read property lcd_bk_en_gpio\n", __FUNCTION__);
384
399
 	} else {
385
-		pdata->ch342_power = ret;
400
+		pdata->lcd_bk_en_gpio = ret;
386
401
 
387
-		ret = devm_gpio_request(&pdev->dev, pdata->ch342_power, "ch342_power");
402
+		ret = devm_gpio_request(&pdev->dev, pdata->lcd_bk_en_gpio, "lcd_bk_en_gpio");
388
403
 		if(ret < 0){
389
-			printk("%s() devm_gpio_request ch342_power request ERROR\n", __FUNCTION__);
404
+			printk("%s() devm_gpio_request lcd_bk_en_gpio request ERROR\n", __FUNCTION__);
390
405
 		}
391
406
 		
392
-		ret = gpio_direction_output(pdata->ch342_power,1);
407
+		ret = gpio_direction_output(pdata->lcd_bk_en_gpio,1);
393
408
 		if(ret < 0){
394
-			printk("%s() gpio_direction_input ch342_power set ERROR\n", __FUNCTION__);
409
+			printk("%s() gpio_direction_output lcd_bk_en_gpio set ERROR\n", __FUNCTION__);
395
410
 		}
396
411
 	}   
397
-*/
412
+	
413
+	   //lcd_pwblk_gpio;
414
+	ret = of_get_named_gpio_flags(node, "lcd_pwblk_gpio", 0, &flags);
415
+	if (ret < 0) {
416
+		printk("%s() Can not read property lcd_pwblk_gpio\n", __FUNCTION__);
417
+	} else {
418
+		pdata->lcd_pwblk_gpio = ret;
419
+
420
+		ret = devm_gpio_request(&pdev->dev, pdata->lcd_pwblk_gpio, "lcd_pwblk_gpio");
421
+		if(ret < 0){
422
+			printk("%s() devm_gpio_request lcd_pwblk_gpio request ERROR\n", __FUNCTION__);
423
+		}
424
+		
425
+		ret = gpio_direction_output(pdata->lcd_pwblk_gpio,1);
426
+		if(ret < 0){
427
+			printk("%s() gpio_direction_output lcd_pwblk_gpio set ERROR\n", __FUNCTION__);
428
+		}
429
+	} 
430
+
398
431
 
399
432
         //edp_set_pixel-s
400
433
          ret = of_get_named_gpio_flags(node, "edp_reset", 0, &flags);
..
..
@@ -498,6 +531,12 @@
498
531
 	gpio_direction_output(gpio2, lvds_gpio[2]);
499
532
 	gpio_direction_output(gpio3, lvds_gpio[3]);
500
533
 	
534
+
535
+	gpio_direction_output(reset_pin, 0);
536
+    usleep_range(80000, 100000);
537
+    gpio_direction_output(reset_pin, 1);
538
+    usleep_range(80000, 100000);
539
+*/
501
540
 	printk(" #######nk_io_control_probe end####### \n");
502
541
 	return 0;
503
542
 	
..
..
@@ -542,38 +581,6 @@
542
581
 
543
582
 static int nk_io_control_resume(struct platform_device *pdev)
544
583
 {
545
-       int ret,reset_pin;
546
-        printk("nk_io resume !!!!\n");
547
-        ret = gpio_get_value(120);
548
-
549
-#if 0
550
-        gpio_set_value(8,1);
551
-	ret = gpio_get_value(8);
552
-	printk("vcc12v gpio value : %d\n",ret);
553
-#endif
554
-#if 0
555
-        gpio_set_value(15,1);
556
-	ret = gpio_get_value(15);
557
-	printk("edp_en gpio value : %d\n",ret);
558
-        gpio_set_value(21,1);
559
-	ret = gpio_get_value(21);
560
-	printk("hub_host3_5v_gpio value : %d\n",ret);
561
-#endif
562
-#if 0
563
-        usleep_range(80000, 100000);
564
-        gpio_set_value(120,0);
565
-//      gpio_direction_output(120, 0);
566
-        usleep_range(80000, 100000);
567
-        ret = gpio_get_value(120);
568
-        printk("edp_reset gpio value : %d\n",ret);
569
-//      gpio_direction_output(120, 1);
570
-        gpio_set_value(120,1);
571
-        usleep_range(80000, 100000);
572
-        ret = gpio_get_value(120);
573
-        printk("edp_reset gpio value : %d\n",ret);
574
-#endif
575
-        //enable = 1;
576
-        //LED_SET(11);
577
584
         return 0;
578
585
 }
579
586