Clean up and document PMU config options

No functional changes, just documenting and renaming.

All boards which use the PMU must provide pmu_board_init().  This was
already true - except that Daisy's pmu_board_init() was implemented as
part of pmu_init() instead of its code living in board.c; I've moved
the code there now.

BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms

Change-Id: I85ad06dc3b6287ad917fe13acf83182f24a8f23d
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/62906
Reviewed-by: Vic Yang <victoryang@chromium.org>

9 files changed, 29 insertions, 12 deletions

diff --git a/board/daisy/board.c b/board/daisy/board.c
index dbd27ed0ef..d9a384983d 100644
--- a/board/daisy/board.c
+++ b/board/daisy/board.c
@@ -163,3 +163,32 @@ void keyboard_suppress_noise(void)
 	gpio_set_level(GPIO_CODEC_INT, 0);
 	gpio_set_level(GPIO_CODEC_INT, 1);
 }
+
+/**
+ * Board-specific PMU init.
+ */
+
+#define CG_CTRL0 0x04
+#define CG_CTRL3 0x07
+
+int pmu_board_init(void)
+{
+	int failure = 0;
+
+	/* Init configuration
+	 *   Fast charge timer    : 2 hours
+	 *   Charger              : disable
+	 *   External pin control : enable
+	 *
+	 * TODO: move settings to battery pack specific init
+	 */
+	if (!failure)
+		failure = pmu_write(CG_CTRL0, 2);
+	/* Limit full charge current to 50%
+	 * TODO: remove this temporary hack.
+	 */
+	if (!failure)
+		failure = pmu_write(CG_CTRL3, 0xbb);
+
+	return failure ? EC_ERROR_UNKNOWN : EC_SUCCESS;
+}
diff --git a/board/pit/board.c b/board/pit/board.c
index 5ba14e3439..018fbbf0f8 100644
--- a/board/pit/board.c
+++ b/board/pit/board.c
@@ -100,7 +100,6 @@ void board_config_post_gpio_init(void)
 	gpio_set_alternate_function(GPIO_B, (1 << 3), GPIO_ALT_TIM2);
 }
 
-#ifdef CONFIG_PMU_BOARD_INIT
 int pmu_board_init(void)
 {
 	int ver, failure = 0;
@@ -162,4 +161,3 @@ int pmu_board_init(void)
 
 	return failure ? EC_ERROR_UNKNOWN : EC_SUCCESS;
 }
-#endif /* CONFIG_BOARD_PMU_INIT */
diff --git a/board/pit/board.h b/board/pit/board.h
index 2877c030c7..7ef77aa2e2 100644
--- a/board/pit/board.h
+++ b/board/pit/board.h
@@ -34,7 +34,6 @@
 #define CONFIG_I2C
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
 #define CONFIG_LID_SWITCH
-#define CONFIG_PMU_BOARD_INIT
 #define CONFIG_PMU_HARD_RESET
 #define CONFIG_PMU_TPS65090
 #define CONFIG_SPI
diff --git a/board/puppy/board.c b/board/puppy/board.c
index 0835305c91..1d288d6848 100644
--- a/board/puppy/board.c
+++ b/board/puppy/board.c
@@ -97,7 +97,6 @@ void board_config_post_gpio_init(void)
 				    GPIO_ALT_USART);
 }
 
-#ifdef CONFIG_PMU_BOARD_INIT
 int pmu_board_init(void)
 {
 	int ver, failure = 0;
@@ -159,4 +158,3 @@ int pmu_board_init(void)
 
 	return failure ? EC_ERROR_UNKNOWN : EC_SUCCESS;
 }
-#endif /* CONFIG_BOARD_PMU_INIT */
diff --git a/board/puppy/board.h b/board/puppy/board.h
index 9059447155..f4f3b9a90d 100644
--- a/board/puppy/board.h
+++ b/board/puppy/board.h
@@ -34,7 +34,6 @@
 #define CONFIG_I2C
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
 #define CONFIG_LID_SWITCH
-#define CONFIG_PMU_BOARD_INIT
 #define CONFIG_PMU_HARD_RESET
 #define CONFIG_PMU_TPS65090
 #define CONFIG_SPI
diff --git a/board/snow/board.c b/board/snow/board.c
index 4b9c0cdcc8..ef5f8488c8 100644
--- a/board/snow/board.c
+++ b/board/snow/board.c
@@ -195,7 +195,6 @@ static void board_shutdown_hook(void)
 }
 DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_shutdown_hook, HOOK_PRIO_DEFAULT);
 
-#ifdef CONFIG_PMU_BOARD_INIT
 int pmu_board_init(void)
 {
 	int ver, failure = 0;
@@ -257,4 +256,3 @@ int pmu_board_init(void)
 
 	return failure ? EC_ERROR_UNKNOWN : EC_SUCCESS;
 }
-#endif /* CONFIG_BOARD_PMU_INIT */
diff --git a/board/snow/board.h b/board/snow/board.h
index d80fd28892..add3a9a8ef 100644
--- a/board/snow/board.h
+++ b/board/snow/board.h
@@ -38,7 +38,6 @@
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
 #define CONFIG_KEYBOARD_SUPPRESS_NOISE
 #define CONFIG_LID_SWITCH
-#define CONFIG_PMU_BOARD_INIT
 #define CONFIG_PMU_HARD_RESET
 #define CONFIG_PMU_TPS65090
 
diff --git a/board/spring/board.c b/board/spring/board.c
index ff7c0fe5b3..98ffe3882e 100644
--- a/board/spring/board.c
+++ b/board/spring/board.c
@@ -203,7 +203,6 @@ static void board_shutdown_hook(void)
 }
 DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_shutdown_hook, HOOK_PRIO_DEFAULT);
 
-#ifdef CONFIG_PMU_BOARD_INIT
 int pmu_board_init(void)
 {
 	int failure = 0;
@@ -239,4 +238,3 @@ int pmu_board_init(void)
 
 	return failure ? EC_ERROR_UNKNOWN : EC_SUCCESS;
 }
-#endif /* CONFIG_BOARD_PMU_INIT */
diff --git a/board/spring/board.h b/board/spring/board.h
index be759987fe..eda82603c8 100644
--- a/board/spring/board.h
+++ b/board/spring/board.h
@@ -40,7 +40,6 @@
 #define CONFIG_LID_SWITCH
 #define CONFIG_LOW_POWER_IDLE	/* Use STOP mode when we have nothing to do */
 #define CONFIG_LED_DRIVER_LP5562
-#define CONFIG_PMU_BOARD_INIT
 #define CONFIG_PMU_FORCE_FET	/* Always enable 3G modem power rail */
 #define CONFIG_PMU_HARD_RESET
 #define CONFIG_PMU_TPS65090