summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRong Chang <rongchang@chromium.org>2013-07-25 09:44:46 -0700
committerChromeBot <chrome-bot@google.com>2013-07-29 11:07:31 -0700
commitbf71082456ab63fd6f7c849e722bedc878b2b98c (patch)
treeee226c0e6eea2931708d1279f5f2736a59dbfa74 /common
parent1b4c5cf71e01ea89af8353eab5e4a62af6d3e894 (diff)
downloadchrome-ec-bf71082456ab63fd6f7c849e722bedc878b2b98c.tar.gz
Add PMU powerinfo host command and console command
Before this change, powerinfo host command supports only one target with USB charging. This change adds a common powerinfo host command and console command for TPSChrome based targets. BRANCH=None BUG=chrome-os-partner:20326 TEST=manual build and flash pit target, check console command 'powerinfo'. check ectool powerinfo with and without AC adapter. Change-Id: I2cfd8dfa011e23f819c6bae19cf22b4a7343f044 Signed-off-by: Rong Chang <rongchang@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/63350 Reviewed-by: Vic Yang <victoryang@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/build.mk1
-rw-r--r--common/pmu_tps65090_powerinfo.c150
2 files changed, 151 insertions, 0 deletions
diff --git a/common/build.mk b/common/build.mk
index 73912d0afe..a509477eb6 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -33,6 +33,7 @@ common-$(CONFIG_CHIPSET_GAIA)+=chipset_gaia.o
common-$(CONFIG_CHIPSET_HASWELL)+=chipset_haswell.o
common-$(CONFIG_CHIPSET_IVYBRIDGE)+=chipset_ivybridge.o
common-$(CONFIG_CHIPSET_X86)+=chipset_x86_common.o
+common-$(CONFIG_PMU_POWERINFO)+=pmu_tps65090_powerinfo.o
common-$(CONFIG_PMU_TPS65090)+=pmu_tps65090.o
common-$(CONFIG_EOPTION)+=eoption.o
common-$(CONFIG_EXTPOWER_FALCO)+=extpower_falco.o
diff --git a/common/pmu_tps65090_powerinfo.c b/common/pmu_tps65090_powerinfo.c
new file mode 100644
index 0000000000..ec3c62ef54
--- /dev/null
+++ b/common/pmu_tps65090_powerinfo.c
@@ -0,0 +1,150 @@
+/* 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.
+ *
+ * TPSChrome powerinfo commands.
+ */
+
+#include "console.h"
+#include "extpower.h"
+#include "host_command.h"
+#include "pmu_tpschrome.h"
+#include "smart_battery.h"
+#include "util.h"
+
+/* FIXME: move all the constants to pmu_tpschrome, make
+ * dcdc3, fet output name configurable.
+ */
+static const struct {
+ const char *name;
+ int voltage_mv;
+ int current_range_ma;
+} pmu_fet[] = {
+ {"backlight", 11400, 1100},
+ {"video" , 5000, 220},
+ {"wwan" , 3300, 3300},
+ {"sdcard" , 3300, 1100},
+ {"camera" , 3300, 1100},
+ {"lcd" , 3300, 1100},
+ {"video_add", 5000, 1100},
+}, pmu_dcdc[] = {
+ {"p5000", 5050, 5000},
+ {"p3300", 3333, 5000},
+ {"p1350", 1350, 5000},
+};
+
+static const int pmu_voltage_range_mv = 17000;
+static const int pmu_ac_sense_range_mv = 33;
+static const int pmu_bat_sense_range_mv = 40;
+static const int pmu_adc_resolution = 1024;
+static const int pmu_sense_resistor_bat = CONFIG_CHARGER_SENSE_RESISTOR;
+static const int pmu_sense_resistor_ac = CONFIG_CHARGER_SENSE_RESISTOR_AC;
+
+static inline int calc_voltage(int adc_value, int range_mv)
+{
+ return adc_value * range_mv / pmu_adc_resolution;
+}
+
+static inline int calc_current(int adc_value, int range_ma)
+{
+ return adc_value * range_ma / pmu_adc_resolution;
+}
+
+static inline int calc_current_sr(int adc_value, int sense_resistor_mohm,
+ int range_mv)
+{
+ return adc_value * range_mv * 1000 / sense_resistor_mohm /
+ pmu_adc_resolution;
+}
+
+static int command_powerinfo(int argc, char **argv)
+{
+ int voltage, current;
+ int index;
+
+ ccputs("[pmu powerinfo]\n");
+ /* DC to DC converter */
+ for (index = 0; index < ARRAY_SIZE(pmu_dcdc); index++) {
+ current = calc_current(
+ pmu_adc_read(ADC_IDCDC1 + index, ADC_FLAG_KEEP_ON),
+ pmu_dcdc[index].current_range_ma);
+ voltage = pmu_dcdc[index].voltage_mv;
+ ccprintf("DCDC%d:%6d mV,%4d mA,%4d mW %s\n",
+ index + 1, voltage, current, voltage * current / 1000,
+ pmu_dcdc[index].name);
+ }
+
+ /* FET */
+ for (index = 0; index < ARRAY_SIZE(pmu_fet); index++) {
+ current = calc_current(
+ pmu_adc_read(ADC_IFET1 + index, ADC_FLAG_KEEP_ON),
+ pmu_fet[index].current_range_ma);
+ voltage = pmu_fet[index].voltage_mv;
+ ccprintf("FET%d :%6d mV,%4d mA,%4d mW %s\n",
+ index + 1, voltage, current, voltage * current / 1000,
+ pmu_fet[index].name);
+ }
+
+ /* Battery charging */
+ voltage = calc_voltage(
+ pmu_adc_read(ADC_VBAT, ADC_FLAG_KEEP_ON),
+ pmu_voltage_range_mv);
+ current = calc_current_sr(
+ pmu_adc_read(ADC_IBAT, ADC_FLAG_KEEP_ON),
+ pmu_sense_resistor_bat, pmu_bat_sense_range_mv);
+ ccprintf("Chg :%6d mV,%4d mA,%4d mW\n", voltage, current,
+ voltage * current / 1000);
+
+ /* AC input */
+ voltage = calc_voltage(
+ pmu_adc_read(ADC_VAC, ADC_FLAG_KEEP_ON),
+ pmu_voltage_range_mv);
+ current = calc_current_sr(
+ pmu_adc_read(ADC_IAC, 0),
+ pmu_sense_resistor_ac, pmu_ac_sense_range_mv);
+ ccprintf("AC :%6d mV,%4d mA,%4d mW\n", voltage, current,
+ voltage * current / 1000);
+
+
+ return EC_SUCCESS;
+}
+DECLARE_CONSOLE_COMMAND(powerinfo, command_powerinfo,
+ NULL,
+ "Show PMU power info",
+ NULL);
+
+static int power_command_info(struct host_cmd_handler_args *args)
+{
+ int bat_charging_current;
+ struct ec_response_power_info *r = args->response;
+
+ r->voltage_ac = calc_voltage(
+ pmu_adc_read(ADC_VAC, ADC_FLAG_KEEP_ON),
+ pmu_voltage_range_mv);
+ if (extpower_is_present()) {
+ /* Power source = AC */
+ r->voltage_system = r->voltage_ac;
+ r->current_system = calc_current_sr(
+ pmu_adc_read(ADC_IAC, ADC_FLAG_KEEP_ON),
+ pmu_sense_resistor_ac, pmu_ac_sense_range_mv);
+ } else {
+ /* Power source == battery */
+ r->voltage_system = calc_voltage(
+ pmu_adc_read(ADC_VBAT, ADC_FLAG_KEEP_ON),
+ pmu_voltage_range_mv);
+ /* PMU reads charging current. When battery is discharging,
+ * ADC returns 0. Use battery gas guage output instead.
+ */
+ battery_current(&bat_charging_current);
+ r->current_system = -bat_charging_current;
+ }
+
+ /* Ignore USB powerinfo fields. */
+ r->usb_dev_type = 0;
+ r->usb_current_limit = 0;
+
+ args->response_size = sizeof(*r);
+
+ return EC_RES_SUCCESS;
+}
+DECLARE_HOST_COMMAND(EC_CMD_POWER_INFO, power_command_info, EC_VER_MASK(0));