Enable charging on Kirby

Now that we have battery and charger drivers, let's enable charging.

BUG=chrome-os-partner:22055
TEST=Test charging/discharging on Kirby
TEST=Unplug battery and see 'error' state
TEST=Plug battery and doesn't see error anymore
BRANCH=None

Change-Id: Idff513b38c9f5bb90700877750f3d2e2154d4b23
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/168007

3 files changed, 40 insertions, 7 deletions

diff --git a/common/battery_kirby.c b/common/battery_kirby.c
new file mode 100644
index 0000000000..38caf37a5b
--- /dev/null
+++ b/common/battery_kirby.c
@@ -0,0 +1,39 @@
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * Battery pack info for Kirby
+ */
+
+#include "battery_pack.h"
+
+/* Battery temperature ranges in degrees C */
+const struct battery_temperature_ranges bat_temp_ranges = {
+	.start_charging_min_c = 0,
+	.start_charging_max_c = 45,
+	.charging_min_c       = 0,
+	.charging_max_c       = 60,
+	.discharging_min_c    = 0,
+	.discharging_max_c    = 100,
+};
+
+static const struct battery_info info = {
+	/*
+	 * TODO(victoryang): What are the correct values?
+	 * Design voltage
+	 *   max    = 4.4V
+	 *   normal = 3.8V
+	 *   min    = 3.0V
+	 */
+	.voltage_max    = 4400,
+	.voltage_normal = 3800,
+	.voltage_min    = 3000,
+
+	/* Pre-charge current: I <= 0.01C */
+	.precharge_current  = 128, /* mA */
+};
+
+const struct battery_info *battery_get_info(void)
+{
+	return &info;
+}
diff --git a/common/build.mk b/common/build.mk
index fa3ad7b24e..a97d9fdf2e 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -13,7 +13,7 @@ common-y+=gpio_common.o version.o printf.o queue.o getset.o
 common-$(BOARD_bolt)+=battery_link.o
 common-$(BOARD_daisy)+=extpower_snow.o
 common-$(BOARD_falco)+=battery_falco.o led_falco.o
-common-$(BOARD_kirby)+=led_kirby.o
+common-$(BOARD_kirby)+=battery_kirby.o led_kirby.o
 common-$(BOARD_link)+=battery_link.o
 common-$(BOARD_peppy)+=battery_peppy.o led_common.o led_peppy.o
 common-$(BOARD_slippy)+=battery_slippy.o led_slippy.o
diff --git a/common/charger_bq24192.c b/common/charger_bq24192.c
index 6debffa347..b9d840d8c3 100644
--- a/common/charger_bq24192.c
+++ b/common/charger_bq24192.c
@@ -160,12 +160,6 @@ int charger_get_current(int *current)
 	return EC_SUCCESS;
 }
 
-/* TODO(victoryang): remove this after enabling charger task on Kirby */
-int charger_closest_current(int current)
-{
-	return current;
-}
-
 int charger_set_current(int current)
 {
 	int rv, val;