summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2015-06-09 11:15:06 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-06-10 18:24:05 +0000
commitfe9e3bf56532b33a9d99b9372b53905dece5907b (patch)
tree6bffb4bdd8ad8bac679e44d021eaf21bcb557fbd /include
parent4e5b020ca917e99c1e68523e4c5aec518b7d9510 (diff)
downloadchrome-ec-fe9e3bf56532b33a9d99b9372b53905dece5907b.tar.gz
Remove obsolete board-specific code
Now that we've removed boards from ToT, also delete board-specific code used only by the removed boards. There are still more things to remove (unused charging chips, LED drivers, COMx support). More CLs coming. BUG=chromium:493866 BRANCH=none TEST=make buildall -j Change-Id: Ie6bdeaf96e61cadd77e3f6336c73b9b54ff4eabb Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/276524 Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/config.h24
-rw-r--r--include/extpower.h10
-rw-r--r--include/extpower_falco.h54
-rw-r--r--include/extpower_spring.h39
4 files changed, 0 insertions, 127 deletions
diff --git a/include/config.h b/include/config.h
index 60adb684d7..aa5e05c7a4 100644
--- a/include/config.h
+++ b/include/config.h
@@ -89,7 +89,6 @@
#undef CONFIG_BATTERY_BQ20Z453
#undef CONFIG_BATTERY_BQ27541
#undef CONFIG_BATTERY_BQ27621
-#undef CONFIG_BATTERY_LINK
#undef CONFIG_BATTERY_RYU
#undef CONFIG_BATTERY_SAMUS
@@ -326,7 +325,6 @@
#undef CONFIG_CHIPSET_BRASWELL /* Intel Braswell (x86) */
#undef CONFIG_CHIPSET_GAIA /* Gaia and Ares (ARM) */
#undef CONFIG_CHIPSET_HASWELL /* Intel Haswell (x86) */
-#undef CONFIG_CHIPSET_IVYBRIDGE /* Intel Ivy Bridge (x86) */
#undef CONFIG_CHIPSET_ROCKCHIP /* Rockchip rk32xx */
#undef CONFIG_CHIPSET_SKYLAKE /* Intel Skylake (x86) */
#undef CONFIG_CHIPSET_TEGRA /* nVidia Tegra 5 */
@@ -558,21 +556,9 @@
/* Include code for handling external power */
#define CONFIG_EXTPOWER
-/* Support turbo-mode chargers */
-#undef CONFIG_EXTPOWER_FALCO
-
/* Support detecting external power presence via a GPIO */
#undef CONFIG_EXTPOWER_GPIO
-/*
- * Support detecting external power presence via a pair of GPIOs, as used
- * on Snow.
- */
-#undef CONFIG_EXTPOWER_SNOW
-
-/* Support providing power to the device via USB on Spring. */
-#undef CONFIG_EXTPOWER_SPRING
-
/*****************************************************************************/
/* Number of cooling fans. Undef if none. */
#undef CONFIG_FANS
@@ -1009,15 +995,6 @@
/* PMU config */
/*
- * Force switching on and off the FETs on the PMU controlling various power
- * rails during AP startup and shutdown sequences. This is mainly useful for
- * bringup when we don't have the corresponding sequences in the AP code.
- *
- * Currently supported only on spring platform.
- */
-#undef CONFIG_PMU_FORCE_FET
-
-/*
* Enable hard-resetting the PMU from the EC. The implementation is rather
* hacky; it simply shorts out the 3.3V rail to force the PMIC to panic. We
* need this unfortunate hack because it's the only way to reset the I2C engine
@@ -1547,7 +1524,6 @@
#undef CONFIG_CHIPSET_BRASWELL
#undef CONFIG_CHIPSET_GAIA
#undef CONFIG_CHIPSET_HASWELL
-#undef CONFIG_CHIPSET_IVYBRIDGE
#undef CONFIG_CHIPSET_ROCKCHIP
#undef CONFIG_CHIPSET_TEGRA
#undef CONFIG_POWER_COMMON
diff --git a/include/extpower.h b/include/extpower.h
index f75a1a5c06..d3f9a4f6ef 100644
--- a/include/extpower.h
+++ b/include/extpower.h
@@ -10,11 +10,6 @@
#include "common.h"
-#ifdef CONFIG_EXTPOWER_SPRING
-/* Spring-USB-power-specific methods */
-#include "extpower_spring.h"
-#endif
-
/**
* Return non-zero if external power is present.
*/
@@ -27,9 +22,4 @@ int extpower_is_present(void);
*/
void extpower_interrupt(enum gpio_signal signal);
-#ifdef CONFIG_EXTPOWER_FALCO
-/* Adapter-specific logic */
-#include "extpower_falco.h"
-#endif
-
#endif /* __CROS_EC_EXTPOWER_H */
diff --git a/include/extpower_falco.h b/include/extpower_falco.h
deleted file mode 100644
index 8d7cb57b8b..0000000000
--- a/include/extpower_falco.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* 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.
- */
-
-/* We can do even smarter charging if we can identify the AC adapter */
-
-#ifndef __CROS_EC_EXTPOWER_FALCO_H
-#define __CROS_EC_EXTPOWER_FALCO_H
-
-#ifdef CONFIG_CHARGER_V2
-#error "This is not compatible with CONFIG_CHARGER_V2"
-/*
- * ... but we can't define CONFIG_CHARGER_V1 because the tests don't need or
- * want charge_state_v1.c. Sigh.
- */
-#endif
-#include "charge_state.h"
-#include "charge_state_v1.h"
-
-/* Supported adapters */
-enum adapter_type {
- ADAPTER_UNKNOWN = 0,
- ADAPTER_45W,
- ADAPTER_65W,
- ADAPTER_90W,
- NUM_ADAPTER_TYPES
-};
-
-/* Adapter identification values */
-struct adapter_id_vals {
- int lo, hi;
-};
-
-/* Adapter-specific parameters. */
-struct adapter_limits {
- int hi_val, lo_val; /* current thresholds (mA) */
- int hi_cnt, lo_cnt; /* count needed to trigger */
- int count; /* samples past the limit */
- int triggered; /* threshold reached */
-};
-
-/* Rate at which adapter samples are collected. */
-#define EXTPOWER_FALCO_POLL_PERIOD (MSEC * 100)
-
-/* Number of special states */
-#define NUM_AC_TURBO_STATES 2
-#define NUM_AC_THRESHOLDS 2
-#define NUM_BATT_THRESHOLDS 2
-
-/* Change turbo mode or throttle the AP depending on the adapter state. */
-void watch_adapter_closely(struct charge_state_context *ctx);
-
-#endif /* __CROS_EC_EXTPOWER_FALCO_H */
diff --git a/include/extpower_spring.h b/include/extpower_spring.h
deleted file mode 100644
index db38f2c230..0000000000
--- a/include/extpower_spring.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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.
- */
-
-/* External power via USB on Spring for Chrome EC */
-
-#ifndef __CROS_EC_EXTPOWER_SPRING_H
-#define __CROS_EC_EXTPOWER_SPRING_H
-
-#include "common.h"
-
-/*
- * TODO(crosbug.com/p/23813): this currently piggy-backs on the charger task.
- * Should be able to move updates to deferred functions and get rid of all the
- * ifdef's in the charger task. At that point, all these APIs will be internal
- * to the extpower module and this entire header file can go away.
- */
-
-/**
- * Properly limit input power on EC boot.
- *
- * Called from charger task.
- */
-void extpower_charge_init(void);
-
-/**
- * Update external power state.
- *
- * Called from charger task.
- */
-void extpower_charge_update(int force_update);
-
-/**
- * Return non-zero if external power needs update from charge task.
- */
-int extpower_charge_needs_update(void);
-
-#endif /* __CROS_EC_EXTPOWER_SPRING_H */