From 94cf1096eeb0e0cb82da8730a3078200e904f351 Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Tue, 30 Apr 2019 10:11:31 +0800
Subject: [PATCH] power: charge animation: fix cmd compile error

cmd depends on DM_CHARGE_DISPLAY and default y.

Change-Id: I5e685e0020c4aa1da80ffc27e5a576bc8969c3be
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
---
 cmd/Kconfig                           | 2 ++
 cmd/charge.c                          | 6 +++---
 drivers/power/charge-display-uclass.c | 2 +-
 include/power/charge_display.h        | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 8f29f886c4..c2d90640f4 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1299,6 +1299,8 @@ config CMD_REGULATOR
 
 config CMD_CHARGE_DISPLAY
 	bool "Enable Driver Model Charge Display command"
+	depends on DM_CHARGE_DISPLAY
+	default y
 	help
 	  Support U-Boot charge display.
 
diff --git a/cmd/charge.c b/cmd/charge.c
index a06eae90c7..bb7a89d771 100644
--- a/cmd/charge.c
+++ b/cmd/charge.c
@@ -10,8 +10,8 @@
 #include <power/charge_display.h>
 #include <power/charge_animation.h>
 
-static int charge_display(cmd_tbl_t *cmdtp, int flag, int argc,
-			  char *const argv[])
+static int do_charge_display(cmd_tbl_t *cmdtp, int flag, int argc,
+			     char *const argv[])
 {
 	int on_soc, on_voltage, screen_voltage;
 	int ret, save[3];
@@ -61,7 +61,7 @@ static int charge_display(cmd_tbl_t *cmdtp, int flag, int argc,
 	return 0;
 }
 
-U_BOOT_CMD(charge, 4, 0, charge_display,
+U_BOOT_CMD(charge, 4, 0, do_charge_display,
 	   "Charge display",
 	   "-charge\n"
 	   "-charge <power on soc> <power on voltage> <screen on voltage>"
diff --git a/drivers/power/charge-display-uclass.c b/drivers/power/charge-display-uclass.c
index 21ea45e9ea..e1a02e7376 100644
--- a/drivers/power/charge-display-uclass.c
+++ b/drivers/power/charge-display-uclass.c
@@ -9,7 +9,7 @@
 #include <dm.h>
 #include <power/charge_display.h>
 
-static int charge_display_show(struct udevice *dev)
+int charge_display_show(struct udevice *dev)
 {
 	const struct dm_charge_display_ops *ops = dev_get_driver_ops(dev);
 
diff --git a/include/power/charge_display.h b/include/power/charge_display.h
index 19f0efabbe..3077b7b856 100644
--- a/include/power/charge_display.h
+++ b/include/power/charge_display.h
@@ -12,5 +12,6 @@ struct dm_charge_display_ops {
 };
 
 int charge_display(void);
+int charge_display_show(struct udevice *dev);
 
 #endif