sync: huiwei 5da0e0ce26e0093b2a169c96b4fc481b8bf31efb

merge into affb3e123b5db5711db87c8819b0306156402e79

arch/riscv/dts/light-huiwei.dts

@@ -11,6 +11,7 @@
 	charge-animation {
 		compatible = "rockchip,uboot-charge";
 		uboot-low-power-voltage = <7300>;
+		powerkey-gpio= <&ao_gpio_porta 6 0>;
 		status = "okay";
 	};
 
@@ -28,6 +29,12 @@
 			label = "battery_full";
 			default-state = "off";
 		};
+
+		blue-led {
+			gpios = <&gpio1_porta 15 0>; // GPIO_ACTIVE_HIGH: 0
+			label = "battery_start";
+			default-state = "off";
+		};
 	};
 
 	memory@0 {
@@ -403,6 +410,22 @@
 			};
 		};
 
+		ao_gpio: gpio@fffff41000 {
+			compatible = "snps,dw-apb-gpio";
+			reg = <0xff 0xfff41000 0x0 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			ao_gpio_porta: ao_gpio-controller@0 {
+				compatible = "snps,dw-apb-gpio-port";
+				gpio-controller;
+				#gpio-cells = <2>;
+				nr-gpios-snps = <32>;
+				reg = <0>;
+
+			};
+		};
+
 		gpio1: gpio@ffec006000 {
 			compatible = "snps,dw-apb-gpio";
 			reg = <0xff 0xec006000 0x0 0x1000>;
@@ -550,7 +573,6 @@
 			compatible      = "ilitek,ili9881c";
 			backlight       = <&lcd_backlight>;
 			reset-gpios     = <&gpio1_porta 5 1>;   /* active low  */
-			led-gpio	= <&gpio1_porta 15 0>;
 			lcd-en-gpios    = <&pcal6408ahk_a 2 0>; /* active high */
 			lcd-bias-en-gpios = <&pcal6408ahk_a 4 0>;/* active high */
 		};

board/thead/light-c910/light.c

@@ -1430,6 +1430,8 @@ static void light_iopin_init(void)
 	light_pin_cfg(CPU_JTG_TMS, PIN_SPEED_NORMAL, PIN_PN, 2);
 	light_pin_mux(CPU_JTG_TDI, 3);
 	light_pin_cfg(CPU_JTG_TDI, PIN_SPEED_NORMAL, PIN_PN, 2);
+	light_pin_mux(CPU_JTG_TRST, 3);
+	light_pin_cfg(CPU_JTG_TRST, PIN_SPEED_NORMAL, PIN_PN, 2);
 
 	light_pin_mux(AOGPIO_7, 1);
 	light_pin_mux(AOGPIO_8, 1);

drivers/power/charge_animation.c

@@ -5,6 +5,7 @@
  */
 
 #include <asm/io.h>
+#include <asm/gpio.h>
 #include <common.h>
 #include <console.h>
 #include <dm.h>
@@ -32,6 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define LED_CHARGING_NAME			"battery_charging"
 #define LED_CHARGING_FULL_NAME			"battery_full"
+#define LED_CHARGING_START_NAME			"battery_start"
 
 struct charge_image {
 	const char *name;
@@ -46,6 +48,7 @@ struct charge_animation_priv {
 #ifdef CONFIG_LED
 	struct udevice *led_charging;
 	struct udevice *led_full;
+	struct udevice *led_start;
 #endif
 	const struct charge_image *image;
 	int image_num;
@@ -55,6 +58,9 @@ struct charge_animation_priv {
 	ulong suspend_delay_timeout;	/* ms */
 };
 
+struct gpio_desc powerkey_gpio;
+static int leds_switch = 0;
+
 #ifdef CONFIG_LED
 static int leds_update(struct udevice *dev, int soc)
 {
@@ -88,8 +94,66 @@ static int leds_update(struct udevice *dev, int soc)
 
 	return 0;
 }
+
+static int leds_charge_on(struct udevice *dev, int soc)
+{
+	struct charge_animation_priv *priv = dev_get_priv(dev);
+	int ret, ledst;
+
+	ledst = LEDST_ON;
+	ret = led_set_state(priv->led_full, ledst);
+		if (ret) {
+			printf("set charging full led %s failed, ret=%d\n",
+			       ledst == LEDST_ON ? "ON" : "OFF", ret);
+			return ret;
+		}
+	return 0;
+}
+
+static int leds_charge_off(struct udevice *dev, int soc)
+{
+	struct charge_animation_priv *priv = dev_get_priv(dev);
+	int ret, ledst;
+	ledst = LEDST_OFF;
+	ret = led_set_state(priv->led_charging, ledst);
+		if (ret) {
+			printf("set charging full led %s failed, ret=%d\n",
+			       ledst == LEDST_ON ? "ON" : "OFF", ret);
+			return ret;
+		}
+	ret = led_set_state(priv->led_full, ledst);
+		if (ret) {
+			printf("set charging full led %s failed, ret=%d\n",
+			       ledst == LEDST_ON ? "ON" : "OFF", ret);
+			return ret;
+		}
+	return 0;
+}
+
+static int leds_charge_update(struct udevice *dev, int soc)
+{
+	struct charge_animation_priv *priv = dev_get_priv(dev);
+	int ret, ledst;
+	if (leds_switch > 5){
+		leds_charge_on(dev, soc);
+	} else {
+		leds_charge_off(dev, soc);
+	}
+	leds_switch++;
+	if (leds_switch > 10)
+		leds_switch = 0;
+	return 0;
+}
+
+
 #else
 static int leds_update(struct udevice *dev, int soc) { return 0; }
+
+static int leds_charge_on(struct udevice *dev, int soc) { return 0; }
+
+static int leds_charge_off(struct udevice *dev, int soc) { return 0; }
+
+static int leds_charge_update(struct udevice *dev, int soc) { return 0; }
 #endif
 
 static int charge_animation_ofdata_to_platdata(struct udevice *dev)
@@ -111,6 +175,22 @@ static int fg_charger_get_chrg_online(struct udevice *dev)
 	return fuel_gauge_get_chrg_online(charger);
 }
 
+static int get_reboot_state(void){
+	const char *var_name = "battery_charge";
+	char *value = env_get(var_name);
+	if (value)
+		if (strcmp(value, "0") == 0) {
+			env_set(var_name, "1");
+			env_save();
+			return 0;
+		}
+
+	env_set(var_name, "1");
+	env_save();
+
+	return 1;
+}
+
 static int charge_animation_show(struct udevice *dev)
 {
 	int soc, voltage, ret, charging = 0;
@@ -151,6 +231,39 @@ static int charge_animation_show(struct udevice *dev)
 		}
 		mdelay(100);
 	};
+	leds_charge_off(dev, soc);
+
+	ret = get_reboot_state();
+
+	charging = fg_charger_get_chrg_online(dev);
+
+	if (!(charging <= 0) && ret != 0)
+		while(1){
+			ret = dm_gpio_get_value(&powerkey_gpio);
+			if (ret == 0){
+				break;
+			}
+
+			charging = fg_charger_get_chrg_online(dev);
+			if (charging <= 0) {
+				mcu_shutdown(); // shutdown system power
+			}
+
+			soc = fuel_gauge_update_get_soc(fg);
+			if (soc == 100){
+				leds_charge_on(dev, soc);
+			}else if (soc < 100){
+				leds_charge_update(dev, soc);
+			}
+			mdelay(300);
+		}
+
+	leds_charge_off(dev, soc);
+
+	ret = led_set_state(priv->led_start, LEDST_ON);
+	if (!ret)
+		printf("Found Charging-Start LED\n");
+
 	return 0;
 }
 
@@ -221,7 +334,15 @@ static int charge_animation_probe(struct udevice *dev)
 	ret = led_get_by_label(LED_CHARGING_FULL_NAME, &priv->led_full);
 	if (!ret)
 		printf("Found Charging-Full LED\n");
+	
+	ret = led_get_by_label(LED_CHARGING_START_NAME, &priv->led_start);
+	if (!ret)
+		printf("Found Charging-Start LED\n");
 #endif
+	ret = gpio_request_by_name(dev, "powerkey-gpio", 0, &powerkey_gpio, 0);
+	if (dm_gpio_is_valid(&powerkey_gpio)) {
+		dm_gpio_set_dir_flags(&powerkey_gpio, GPIOD_IS_IN);
+	}
 
 	printf("Enable charge animation display\n");
 

drivers/video/ilitek-ili9881c.c

@@ -12,7 +12,6 @@ enum ili9881c_op {
 	ILI9881C_COMMAND,
 };
 
-struct gpio_desc led_gpio;
 
 struct ili9881c_instr {
 	enum ili9881c_op        op;
@@ -482,13 +481,6 @@ static int ili9881c_panel_ofdata_to_platdata(struct udevice *dev)
 		mdelay(100);
 	}
 
-	ret = gpio_request_by_name(dev, "led-gpio", 0, &led_gpio, 0);
-	if (dm_gpio_is_valid(&led_gpio)) {
-		dm_gpio_set_dir_flags(&led_gpio, GPIOD_IS_OUT);
-		dm_gpio_set_value(&led_gpio, 1);
-	} else {
-		
-	}
 
 	/* power gpios */
 	ret = gpio_request_by_name(dev, "lcd-en-gpios", 0,

env/env.c

@@ -243,7 +243,7 @@ int env_save(void)
 		if (!env_has_inited(drv->location))
 			return -ENODEV;
 
-		printf("Saving Environment to %s... ", drv->name);
+		// printf("Saving Environment to %s... ", drv->name);
 		ret = drv->save();
 		if (ret)
 			printf("Failed (%d)\n", ret);