cleanup: Rename and move header files

Device-specific headers belong in driver/ or chip/.  The include/
directory should be for common interfaces.

Code should not normally need to include driver-specific headers.  If
it does, it should use the full relative path from the EC project root
(for example, drivers/charger/bq24715.h).

Change-Id: Id23db37a431e2d802a74ec601db6f69b613352ba
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/173746
Reviewed-by: Bill Richardson <wfrichar@chromium.org>

10 files changed, 317 insertions, 5 deletions

diff --git a/driver/charger/bq24192.c b/driver/charger/bq24192.c
index 72f778d367..17297cd9ce 100644
--- a/driver/charger/bq24192.c
+++ b/driver/charger/bq24192.c
@@ -5,8 +5,8 @@
  * TI bq24192 battery charger driver.
  */
 
+#include "bq24192.h"
 #include "charger.h"
-#include "charger_bq24192.h"
 #include "common.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/driver/charger/bq24192.h b/driver/charger/bq24192.h
new file mode 100644
index 0000000000..4177dc5c2c
--- /dev/null
+++ b/driver/charger/bq24192.h
@@ -0,0 +1,28 @@
+/* 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.
+ *
+ * TI bq24192 battery charger driver.
+ */
+
+#ifndef __CROS_EC_CHARGER_BQ24192_H
+#define __CROS_EC_CHARGER_BQ24192_H
+
+#define BQ24192_ADDR 0xd6
+
+/* Registers */
+#define BQ24192_REG_INPUT_CTRL      0x0
+#define BQ24192_REG_POWER_ON_CFG    0x1
+#define BQ24192_REG_CHG_CURRENT     0x2
+#define BQ24192_REG_PRE_CHG_CURRENT 0x3
+#define BQ24192_REG_CHG_VOLTAGE     0x4
+#define BQ24192_REG_CHG_TERM_TMR    0x5
+#define BQ24192_REG_IR_COMP         0x6
+#define BQ24192_REG_MISC_OP         0x7
+#define BQ24192_REG_STATUS          0x8
+#define BQ24192_REG_FAULT           0x9
+#define BQ24192_REG_ID              0xa
+
+#define BQ24192_DEVICE_ID           0x2b
+
+#endif /* __CROS_EC_CHARGER_BQ24192_H */
diff --git a/driver/charger/bq24707a.c b/driver/charger/bq24707a.c
index 43bd32eb91..67467610df 100644
--- a/driver/charger/bq24707a.c
+++ b/driver/charger/bq24707a.c
@@ -6,8 +6,8 @@
  */
 
 #include "battery_smart.h"
+#include "bq24707a.h"
 #include "charger.h"
-#include "charger_bq24707a.h"
 #include "console.h"
 #include "common.h"
 #include "util.h"
diff --git a/driver/charger/bq24707a.h b/driver/charger/bq24707a.h
new file mode 100644
index 0000000000..744e991283
--- /dev/null
+++ b/driver/charger/bq24707a.h
@@ -0,0 +1,44 @@
+/* Copyright (c) 2012 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.
+ *
+ * TI bq24707A battery charger driver.
+ */
+
+#ifndef __CROS_EC_CHARGER_BQ24707A_H
+#define __CROS_EC_CHARGER_BQ24707A_H
+
+/* Chip specific commands */
+#define BQ24707_CHARGE_OPTION           0x12
+#define BQ24707_INPUT_CURRENT           0x3f
+#define BQ24707_MANUFACTURE_ID          0xfe
+#define BQ24707_DEVICE_ID               0xff
+
+/* ChargeOption 0x12 */
+#define OPTION_CHARGE_INHIBIT           (1 << 0)
+#define OPTION_ACOC_THRESHOLD           (3 << 1)
+#define OPTION_COMPARATOR_THRESHOLD     (1 << 4)
+#define OPTION_IOUT_SELECTION           (1 << 5)
+#define OPTION_IFAULT_HI_THRESHOLD      (3 << 7)
+#define OPTION_EMI_FREQ_ENABLE          (1 << 9)
+#define OPTION_EMI_FREQ_ADJ             (1 << 10)
+#define OPTION_WATCHDOG_TIMER           (3 << 13)
+#define OPTION_AOC_DELITCH_TIME         (1 << 15)
+/* OPTION_ACOC_THRESHOLD */
+#define ACOC_THRESHOLD_DISABLE          (0 << 1)
+#define ACOC_THRESHOLD_133X             (1 << 1)
+#define ACOC_THRESHOLD_166X_DEFAULT     (2 << 1)
+#define ACOC_THRESHOLD_222X             (3 << 1)
+/* OPTION_IFAULT_HI_THRESHOLD */
+#define IFAULT_THRESHOLD_300MV          (0 << 7)
+#define IFAULT_THRESHOLD_500MV          (1 << 7)
+#define IFAULT_THRESHOLD_700MV_DEFAULT  (2 << 7)
+#define IFAULT_THRESHOLD_900MV          (3 << 7)
+/* OPTION_WATCHDOG_TIMER */
+#define CHARGE_WATCHDOG_DISABLE         (0 << 13)
+#define CHARGE_WATCHDOG_44SEC           (1 << 13)
+#define CHARGE_WATCHDOG_88SEC           (2 << 13)
+#define CHARGE_WATCHDOG_175SEC_DEFAULT  (3 << 13)
+
+#endif /* __CROS_EC_CHARGER_BQ24707A_H */
+
diff --git a/driver/charger/bq24715.c b/driver/charger/bq24715.c
index d90b35b021..14779225fc 100644
--- a/driver/charger/bq24715.c
+++ b/driver/charger/bq24715.c
@@ -6,8 +6,8 @@
  */
 
 #include "battery_smart.h"
+#include "bq24715.h"
 #include "charger.h"
-#include "charger_bq24715.h"
 #include "console.h"
 #include "common.h"
 #include "util.h"
diff --git a/driver/charger/bq24715.h b/driver/charger/bq24715.h
new file mode 100644
index 0000000000..1c3df77725
--- /dev/null
+++ b/driver/charger/bq24715.h
@@ -0,0 +1,130 @@
+/* Copyright (c) 2012 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.
+ *
+ * TI bq24715 battery charger driver.
+ */
+
+#ifndef __CROS_EC_CHARGER_BQ24715_H
+#define __CROS_EC_CHARGER_BQ24715_H
+
+/* NOTES:
+ * If battery is not present keep charge current register (0x14) at 0.
+ * Max charge voltage (0x15) needs to be programmed before 0x14.
+ */
+
+/* Chip specific registers */
+#define BQ24715_CHARGE_OPTION           0x12
+#define BQ24715_CHARGE_CURRENT          0x14
+#define BQ24715_MAX_CHARGE_VOLTAGE      0x15
+#define BQ24715_MIN_SYSTEM_VOLTAGE      0x3e
+#define BQ24715_INPUT_CURRENT           0x3f
+#define BQ24715_MANUFACTURER_ID         0xfe
+#define BQ24715_DEVICE_ID               0xff
+
+/* ChargeOption Register - 0x12 */
+#define OPT_LOWPOWER_MASK               (1 << 15)
+#define   OPT_LOWPOWER_DSCHRG_I_MON_ON    (0 << 15)
+#define   OPT_LOWPOWER_DSCHRG_I_MON_OFF   (1 << 15)
+#define OPT_WATCHDOG_MASK               (3 << 13)
+#define   OPT_WATCHDOG_DISABLE            (0 << 13)
+#define   OPT_WATCHDOG_44SEC              (1 << 13)
+#define   OPT_WATCHDOG_88SEC              (2 << 13)
+#define   OPT_WATCHDOG_175SEC             (3 << 13)
+#define OPT_SYSOVP_MASK                 (1 << 12)
+#define   OPT_SYSOVP_15P1_3SEC_10P1_2SEC  (0 << 12)
+#define   OPT_SYSOVP_17P0_3SEC_11P3_2SEC  (1 << 12)
+#define OPT_SYSOVP_STATUS_MASK          (1 << 11)
+#define   OPT_SYSOVP_STATUS               (1 << 11)
+#define OPT_AUDIO_FREQ_LIMIT_MASK       (1 << 10)
+#define   OPT_AUDIO_FREQ_NO_LIMIT         (0 << 10)
+#define   OPT_AUDIO_FREQ_40KHZ_LIMIT      (1 << 10)
+#define OPT_SWITCH_FREQ_MASK            (3 << 8)
+#define   OPT_SWITCH_FREQ_600KHZ          (0 << 8)
+#define   OPT_SWITCH_FREQ_800KHZ          (1 << 8)
+#define   OPT_SWITCH_FREQ_1MHZ            (2 << 8)
+#define   OPT_SWITCH_FREQ_800KHZ_DUP      (3 << 8)
+#define OPT_ACOC_MASK                   (1 << 7)
+#define   OPT_ACOC_DISABLED               (0 << 7)
+#define   OPT_ACOC_333PCT_IPDM            (1 << 7)
+#define OPT_LSFET_OCP_MASK              (1 << 6)
+#define   OPT_LSFET_OCP_250MV             (0 << 6)
+#define   OPT_LSFET_OCP_350MV             (1 << 6)
+#define OPT_LEARN_MASK                  (1 << 5)
+#define   OPT_LEARN_DISABLE               (0 << 5)
+#define   OPT_LEARN_ENABLE                (1 << 5)
+#define OPT_IOUT_MASK                   (1 << 4)
+#define   OPT_IOUT_40X                    (0 << 4)
+#define   OPT_IOUT_16X                    (1 << 4)
+#define OPT_FIX_IOUT_MASK               (1 << 3)
+#define   OPT_FIX_IOUT_IDPM_EN            (0 << 3)
+#define   OPT_FIX_IOUT_ALWAYS             (1 << 3)
+#define OPT_LDO_MODE_MASK               (1 << 2)
+#define   OPT_LDO_DISABLE                 (0 << 2)
+#define   OPT_LDO_ENABLE                  (1 << 2)
+#define OPT_ODPM_MASK                   (1 << 1)
+#define   OPT_ODPM_DISABLE                (0 << 1)
+#define   OPT_ODPM_ENABLE                 (1 << 1)
+#define OPT_CHARGE_INHIBIT_MASK         (1 << 0)
+#define   OPT_CHARGE_ENABLE               (0 << 0)
+#define   OPT_CHARGE_DISABLE              (1 << 0)
+
+
+/* ChargeCurrent Register - 0x14
+ * The ChargeCurrent register controls a DAC. Therefore
+ * the below definitions are cummulative. */
+#define CHARGE_I_64MA                   (1 << 6)
+#define CHARGE_I_128MA                  (1 << 7)
+#define CHARGE_I_256MA                  (1 << 8)
+#define CHARGE_I_512MA                  (1 << 9)
+#define CHARGE_I_1024MA                 (1 << 10)
+#define CHARGE_I_2048MA                 (1 << 11)
+#define CHARGE_I_4096MA                 (1 << 12)
+#define CHARGE_I_OFF                    (0)
+#define CHARGE_I_MIN                    (128)
+#define CHARGE_I_MAX                    (8128)
+#define CHARGE_I_STEP                   (64)
+
+/* MaxChargeVoltage Register - 0x15
+ * The MaxChargeVoltage register controls a DAC. Therefore
+ * the below definitions are cummulative. */
+#define CHARGE_V_16MV                   (1 << 4)
+#define CHARGE_V_32MV                   (1 << 5)
+#define CHARGE_V_64MV                   (1 << 6)
+#define CHARGE_V_128MV                  (1 << 7)
+#define CHARGE_V_256MV                  (1 << 8)
+#define CHARGE_V_512MV                  (1 << 9)
+#define CHARGE_V_1024MV                 (1 << 10)
+#define CHARGE_V_2048MV                 (1 << 11)
+#define CHARGE_V_4096MV                 (1 << 12)
+#define CHARGE_V_8192MV                 (1 << 13)
+#define CHARGE_V_MIN                    (4096)
+#define CHARGE_V_MAX                    (0x3ff0)
+#define CHARGE_V_STEP                   (16)
+
+/* MinSystemVoltage Register - 0x3e
+ * The MinSystemVoltage register controls a DAC. Therefore
+ * the below definitions are cummulative. */
+#define MIN_SYS_V_256MV                 (1 << 8)
+#define MIN_SYS_V_512MV                 (1 << 9)
+#define MIN_SYS_V_1024MV                (1 << 10)
+#define MIN_SYS_V_2048MV                (1 << 11)
+#define MIN_SYS_V_4096MV                (1 << 12)
+#define MIN_SYS_V_8192MV                (1 << 13)
+#define MIN_SYS_V_MIN                   (4096)
+
+/* InputCurrent Register - 0x3f
+ * The InputCurrent register controls a DAC. Therefore
+ * the below definitions are cummulative. */
+#define INPUT_I_64MA                   (1 << 6)
+#define INPUT_I_128MA                  (1 << 7)
+#define INPUT_I_256MA                  (1 << 8)
+#define INPUT_I_512MA                  (1 << 9)
+#define INPUT_I_1024MA                 (1 << 10)
+#define INPUT_I_2048MA                 (1 << 11)
+#define INPUT_I_4096MA                 (1 << 12)
+#define INPUT_I_MIN                    (128)
+#define INPUT_I_MAX                    (8064)
+#define INPUT_I_STEP                   (64)
+
+#endif /* __CROS_EC_CHARGER_BQ24715_H */
diff --git a/driver/charger/bq24725.c b/driver/charger/bq24725.c
index 3e418c7216..2265a294b7 100644
--- a/driver/charger/bq24725.c
+++ b/driver/charger/bq24725.c
@@ -6,8 +6,8 @@
  */
 
 #include "battery_smart.h"
+#include "bq24725.h"
 #include "charger.h"
-#include "charger_bq24725.h"
 #include "console.h"
 #include "common.h"
 #include "util.h"
diff --git a/driver/charger/bq24725.h b/driver/charger/bq24725.h
new file mode 100644
index 0000000000..3deb41d125
--- /dev/null
+++ b/driver/charger/bq24725.h
@@ -0,0 +1,50 @@
+/* Copyright (c) 2012 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.
+ *
+ * TI bq24725 battery charger driver.
+ */
+
+#ifndef __CROS_EC_CHARGER_BQ24725_H
+#define __CROS_EC_CHARGER_BQ24725_H
+
+/* Chip specific commands */
+#define BQ24725_CHARGE_OPTION           0x12
+#define BQ24725_INPUT_CURRENT           0x3f
+#define BQ24725_MANUFACTURE_ID          0xfe
+#define BQ24725_DEVICE_ID               0xff
+
+/* ChargeOption 0x12 */
+#define OPTION_CHARGE_INHIBIT           (1 << 0)
+#define OPTION_ACOC_THRESHOLD           (3 << 1)
+#define OPTION_IOUT_SELECTION           (1 << 5)
+#define OPTION_LEARN_ENABLE             (1 << 6)
+#define OPTION_IFAULT_HI_THRESHOLD      (3 << 7)
+#define OPTION_EMI_FREQ_ENABLE          (1 << 9)
+#define OPTION_EMI_FREQ_ADJ             (1 << 10)
+#define OPTION_BAT_DEPLETION_THRESHOLD  (3 << 11)
+#define OPTION_WATCHDOG_TIMER           (3 << 13)
+#define OPTION_AOC_DELITCH_TIME         (1 << 15)
+/* OPTION_ACOC_THRESHOLD */
+#define ACOC_THRESHOLD_DISABLE          (0 << 1)
+#define ACOC_THRESHOLD_133X             (1 << 1)
+#define ACOC_THRESHOLD_166X_DEFAULT     (2 << 1)
+#define ACOC_THRESHOLD_222X             (3 << 1)
+/* OPTION_IFAULT_HI_THRESHOLD */
+#define IFAULT_THRESHOLD_300MV          (0 << 7)
+#define IFAULT_THRESHOLD_500MV          (1 << 7)
+#define IFAULT_THRESHOLD_700MV_DEFAULT  (2 << 7)
+#define IFAULT_THRESHOLD_900MV          (3 << 7)
+/* OPTION_BAT_DEPLETION_THRESHOLD */
+#define FALLING_THRESHOLD_5919          (0 << 11)
+#define FALLING_THRESHOLD_6265          (1 << 11)
+#define FALLING_THRESHOLD_6655          (2 << 11)
+#define FALLING_THRESHOLD_7097_DEFAULT  (3 << 11)
+/* OPTION_WATCHDOG_TIMER */
+#define CHARGE_WATCHDOG_DISABLE         (0 << 13)
+#define CHARGE_WATCHDOG_44SEC           (1 << 13)
+#define CHARGE_WATCHDOG_88SEC           (2 << 13)
+#define CHARGE_WATCHDOG_175SEC_DEFAULT  (3 << 13)
+
+#endif /* __CROS_EC_CHARGER_BQ24725_H */
+
diff --git a/driver/charger/bq24738.c b/driver/charger/bq24738.c
index 057e71c12f..7bd8e42a02 100644
--- a/driver/charger/bq24738.c
+++ b/driver/charger/bq24738.c
@@ -6,8 +6,8 @@
  */
 
 #include "battery_smart.h"
+#include "bq24738.h"
 #include "charger.h"
-#include "charger_bq24738.h"
 #include "console.h"
 #include "common.h"
 #include "util.h"
diff --git a/driver/charger/bq24738.h b/driver/charger/bq24738.h
new file mode 100644
index 0000000000..402b801a0c
--- /dev/null
+++ b/driver/charger/bq24738.h
@@ -0,0 +1,60 @@
+/* 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.
+ *
+ * TI bq24738 battery charger driver.
+ */
+
+#ifndef __CROS_EC_CHARGER_BQ24738_H
+#define __CROS_EC_CHARGER_BQ24738_H
+
+/* Chip specific commands */
+#define BQ24738_CHARGE_OPTION           0x12
+#define BQ24738_INPUT_CURRENT           0x3f
+#define BQ24738_MANUFACTURE_ID          0xfe
+#define BQ24738_DEVICE_ID               0xff
+
+/* ChargeOption 0x12 */
+#define OPTION_CHARGE_INHIBIT           (1 << 0)
+#define OPTION_ACOC_THRESHOLD           (1 << 1)
+#define OPTION_BOOST_MODE_STATE         (1 << 2)
+#define OPTION_BOOST_MODE_ENABLE        (1 << 3)
+#define OPTION_ACDET_STATE              (1 << 4)
+#define OPTION_IOUT_SELECTION           (1 << 5)
+#define OPTION_LEARN_ENABLE             (1 << 6)
+#define OPTION_IFAULT_LOW_THRESHOLD     (1 << 7)
+#define OPTION_IFAULT_HI_ENABLE         (1 << 8)
+#define OPTION_EMI_FREQ_ENABLE          (1 << 9)
+#define OPTION_EMI_FREQ_ADJ             (1 << 10)
+#define OPTION_BAT_DEPLETION_THRESHOLD  (3 << 11)
+#define OPTION_WATCHDOG_TIMER           (3 << 13)
+#define OPTION_ACPRES_DEGLITCH_TIME     (1 << 15)
+
+/* OPTION_ACOC_THRESHOLD */
+#define ACOC_THRESHOLD_DISABLE          (0 << 1)
+#define ACOC_THRESHOLD_133X             (1 << 1)
+
+/* OPTION_IFAULT_LOW_THRESHOLD */
+#define IFAULT_LOW_135MV_DEFAULT        (0 << 7)
+#define IFAULT_LOW_230MV                (1 << 7)
+
+/* OPTION_BAT_DEPLETION_THRESHOLD */
+#define FALLING_THRESHOLD_5919          (0 << 11)
+#define FALLING_THRESHOLD_6265          (1 << 11)
+#define FALLING_THRESHOLD_6655          (2 << 11)
+#define FALLING_THRESHOLD_7097_DEFAULT  (3 << 11)
+
+/* OPTION_WATCHDOG_TIMER */
+#define CHARGE_WATCHDOG_DISABLE         (0 << 13)
+#define CHARGE_WATCHDOG_44SEC           (1 << 13)
+#define CHARGE_WATCHDOG_88SEC           (2 << 13)
+#define CHARGE_WATCHDOG_175SEC_DEFAULT  (3 << 13)
+
+/* OPTION_ACPRES_DEGLITCH_TIME */
+#define ACPRES_DEGLITCH_150MS           (0 << 15)
+#define ACPRES_DEGLITCH_1300MS_DEFAULT  (1 << 15)
+
+/* Discharge battery when on AC power. */
+int charger_discharge_on_ac(int enable);
+
+#endif /* __CROS_EC_CHARGER_BQ24738_H */