fix(battery): fix suspend err & add usb en

huangcm

2025-04-07 511b111543524704f6182b374e489f5d0e51db8c

fix(battery): fix suspend err & add usb en

 longan/brandy/brandy-2.0/u-boot-2018/board/sunxi/power_manage.c
..
..
@@ -454,6 +454,7 @@
454
454
 	char bootreason[16] = {0};
455
455
 	int ret = 0, bat_exist = 0;
456
456
     int dcin_exist = pmu_get_reg_value(AXP81X_STATUS);
457
+    int sys_mode = 0;
457
458
 
458
459
 	ret = script_parser_fetch(FDT_PATH_POWER_SPLY, "battery_exist", &bat_exist, 1);
459
460
 	if (ret < 0) {
..
..
@@ -470,7 +471,8 @@
470
471
 	val = gd->pmu_saved_status;
471
472
 #endif
472
473
 #endif
473
-    printf("kickpi pmu_get_sys_mode = %d\n", pmu_get_sys_mode());
474
+    sys_mode = pmu_get_sys_mode();
475
+    printf("kickpi pmu_get_sys_mode = %d\n", sys_mode);
474
476
 	if ((val == -1) && (pmu_get_sys_mode() == SUNXI_CHARGING_FLAG)) {
475
477
 		val = AXP_BOOT_SOURCE_CHARGER;
476
478
 		pmu_set_sys_mode(0);
..
..
@@ -478,11 +480,16 @@
478
480
 
479
481
     if (bat_exist == 1) {
480
482
         /* When the battery exists, it can only be turned on by power key */
481
-        if (pmu_axp707_get_poweron_source() != AXP_BOOT_SOURCE_BUTTON) {
483
+        if (pmu_axp707_get_poweron_source() != AXP_BOOT_SOURCE_BUTTON &&
484
+                sys_mode != 66 ) {
482
485
             val = AXP_BOOT_SOURCE_CHARGER;
483
-            pmu_set_sys_mode(0);
486
+            pmu_set_sys_mode(66);
484
487
             printf("kickpi[bat_exist] not power key up when boot on \n");
485
488
         }
489
+
490
+        if (sys_mode == 66) {
491
+            pmu_set_sys_mode(0);
492
+        }
486
493
     }
487
494
 
488
495
 	switch (val) {
 longan/device/config/chips/a133/configs/c3/kickpi-k5c.dts
..
..
@@ -1336,10 +1336,10 @@
1336
1336
 			pinctrl-names = "default";
1337
1337
 			status = "okay";
1338
1338
 
1339
-			sysled {
1340
-				label = "sysled";
1341
-				gpios = <&r_pio PL 10 1 0 1 1>;
1342
-				linux,default_trigger = "heartbeat";
1339
+			usb2_en {
1340
+				label = "usb2_en";
1341
+				gpios = <&r_pio PL 10 1 0 1 0>;
1342
+				linux,default_trigger = "default-on";
1343
1343
 			};
1344
1344
 
1345
1345
             spk_en {
 longan/kernel/linux-4.9/kernel/printk/printk.c
..
..
@@ -2151,12 +2151,13 @@
2151
2151
 	return __add_preferred_console(name, idx, options, NULL);
2152
2152
 }
2153
2153
 
2154
-bool console_suspend_enabled = true;
2154
+bool console_suspend_enabled = false;
2155
2155
 EXPORT_SYMBOL(console_suspend_enabled);
2156
2156
 
2157
2157
 static int __init console_suspend_disable(char *str)
2158
2158
 {
2159
2159
 	console_suspend_enabled = false;
2160
+    // console_suspend_enabled = true;
2160
2161
 	return 1;
2161
2162
 }
2162
2163
 __setup("no_console_suspend", console_suspend_disable);