rambi: Remove ignored PCH signalsstabilize-5579.B

The EC had inputs with internal pullups on SUS_STAT#, SUSPWRDNACK, and
SLP_SX#.  But we never used those signals for anything.  The pullups
cost 1.5 mW power in S3.  So, remove those signals and their pullups.
They can be turned back on via CONFIG_CHIPSET_DEBUG.

BUG=chrome-os-partner:25568
BRANCH=rambi
TEST=build with and without CONFIG_CHIPSET_DEBUG.  Verify gpioget and
     powerindebug show the signals only when it's defined.

Change-Id: I0851243615c91a3aa8aa1b28df70809b578d2e74
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/188389
Reviewed-by: Dave Parker <dparker@chromium.org>

5 files changed, 22 insertions, 3 deletions

diff --git a/board/rambi/board.c b/board/rambi/board.c
index 03912f5e00..d78f31e635 100644
--- a/board/rambi/board.c
+++ b/board/rambi/board.c
@@ -69,12 +69,14 @@ const struct gpio_info gpio_list[] = {
 	{"BOARD_VERSION1",       LM4_GPIO_Q, (1<<5), GPIO_INPUT, NULL},
 	{"BOARD_VERSION2",       LM4_GPIO_Q, (1<<6), GPIO_INPUT, NULL},
 	{"BOARD_VERSION3",       LM4_GPIO_Q, (1<<7), GPIO_INPUT, NULL},
+#ifdef CONFIG_CHIPSET_DEBUG
 	{"PCH_SLP_SX_L",         LM4_GPIO_G, (1<<3), GPIO_INPUT|GPIO_PULL_UP,
 	 NULL},
 	{"PCH_SUS_STAT_L",       LM4_GPIO_G, (1<<6), GPIO_INPUT|GPIO_PULL_UP,
 	 NULL},
 	{"PCH_SUSPWRDNACK",      LM4_GPIO_G, (1<<2), GPIO_INPUT|GPIO_PULL_UP,
 	 NULL},
+#endif
 	{"PP1000_S0IX_PGOOD",    LM4_GPIO_H, (1<<6), GPIO_INPUT, NULL},
 	{"USB1_OC_L",            LM4_GPIO_E, (1<<7), GPIO_INPUT, NULL},
 	{"USB2_OC_L",            LM4_GPIO_E, (1<<0), GPIO_INPUT, NULL},
@@ -136,9 +138,11 @@ const struct power_signal_info power_signal_list[] = {
 	{GPIO_PP1000_S0IX_PGOOD, 1, "PGOOD_PP1000_S0IX"},
 	{GPIO_PCH_SLP_S3_L,      1, "SLP_S3#_DEASSERTED"},
 	{GPIO_PCH_SLP_S4_L,      1, "SLP_S4#_DEASSERTED"},
+#ifdef CONFIG_CHIPSET_DEBUG
 	{GPIO_PCH_SLP_SX_L,      1, "SLP_SX#_DEASSERTED"},
 	{GPIO_PCH_SUS_STAT_L,    0, "SUS_STAT#_ASSERTED"},
 	{GPIO_PCH_SUSPWRDNACK,   1, "SUSPWRDNACK_ASSERTED"},
+#endif
 };
 BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
diff --git a/board/rambi/board.h b/board/rambi/board.h
index 3a19a55c71..331fcc17af 100644
--- a/board/rambi/board.h
+++ b/board/rambi/board.h
@@ -88,9 +88,11 @@ enum gpio_signal {
 	GPIO_BOARD_VERSION1,       /* Board version stuffing resistor 1 */
 	GPIO_BOARD_VERSION2,       /* Board version stuffing resistor 2 */
 	GPIO_BOARD_VERSION3,       /* Board version stuffing resistor 3 */
+#ifdef CONFIG_CHIPSET_DEBUG
 	GPIO_PCH_SLP_SX_L,         /* SLP_S0IX# signal from PCH */
 	GPIO_PCH_SUS_STAT_L,       /* SUS_STAT# signal from PCH */
 	GPIO_PCH_SUSPWRDNACK,      /* SUSPWRDNACK signal from PCH */
+#endif
 	GPIO_PP1000_S0IX_PGOOD,    /* Power good on 1.00V (S0iX supplies) */
 	GPIO_USB1_OC_L,            /* USB port overcurrent warning */
 	GPIO_USB2_OC_L,            /* USB port overcurrent warning */
@@ -145,9 +147,11 @@ enum power_signal {
 	X86_PGOOD_PP1000_S0IX,
 	X86_SLP_S3_DEASSERTED,
 	X86_SLP_S4_DEASSERTED,
+#ifdef CONFIG_CHIPSET_DEBUG
 	X86_SLP_SX_DEASSERTED,
 	X86_SUS_STAT_ASSERTED,
 	X86_SUSPWRDNACK_ASSERTED,
+#endif
 
 	/* Number of X86 signals */
 	POWER_SIGNAL_COUNT
diff --git a/board/squawks/board.c b/board/squawks/board.c
index 150be8a911..9ea101b920 100644
--- a/board/squawks/board.c
+++ b/board/squawks/board.c
@@ -68,12 +68,14 @@ const struct gpio_info gpio_list[] = {
 	{"BOARD_VERSION1",       LM4_GPIO_Q, (1<<5), GPIO_INPUT, NULL},
 	{"BOARD_VERSION2",       LM4_GPIO_Q, (1<<6), GPIO_INPUT, NULL},
 	{"BOARD_VERSION3",       LM4_GPIO_Q, (1<<7), GPIO_INPUT, NULL},
+#ifdef CONFIG_CHIPSET_DEBUG
 	{"PCH_SLP_SX_L",         LM4_GPIO_G, (1<<3), GPIO_INPUT|GPIO_PULL_UP,
 	 NULL},
 	{"PCH_SUS_STAT_L",       LM4_GPIO_G, (1<<6), GPIO_INPUT|GPIO_PULL_UP,
 	 NULL},
 	{"PCH_SUSPWRDNACK",      LM4_GPIO_G, (1<<2), GPIO_INPUT|GPIO_PULL_UP,
 	 NULL},
+#endif
 	{"PP1000_S0IX_PGOOD",    LM4_GPIO_H, (1<<6), GPIO_INPUT, NULL},
 	{"USB1_OC_L",            LM4_GPIO_E, (1<<7), GPIO_INPUT, NULL},
 	{"USB2_OC_L",            LM4_GPIO_E, (1<<0), GPIO_INPUT, NULL},
@@ -136,9 +138,11 @@ const struct power_signal_info power_signal_list[] = {
 	{GPIO_PP1000_S0IX_PGOOD, 1, "PGOOD_PP1000_S0IX"},
 	{GPIO_PCH_SLP_S3_L,      1, "SLP_S3#_DEASSERTED"},
 	{GPIO_PCH_SLP_S4_L,      1, "SLP_S4#_DEASSERTED"},
+#ifdef CONFIG_CHIPSET_DEBUG
 	{GPIO_PCH_SLP_SX_L,      1, "SLP_SX#_DEASSERTED"},
 	{GPIO_PCH_SUS_STAT_L,    0, "SUS_STAT#_ASSERTED"},
 	{GPIO_PCH_SUSPWRDNACK,   1, "SUSPWRDNACK_ASSERTED"},
+#endif
 };
 BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
diff --git a/board/squawks/board.h b/board/squawks/board.h
index bcea509921..e637f5917d 100644
--- a/board/squawks/board.h
+++ b/board/squawks/board.h
@@ -84,9 +84,11 @@ enum gpio_signal {
 	GPIO_BOARD_VERSION1,       /* Board version stuffing resistor 1 */
 	GPIO_BOARD_VERSION2,       /* Board version stuffing resistor 2 */
 	GPIO_BOARD_VERSION3,       /* Board version stuffing resistor 3 */
+#ifdef CONFIG_CHIPSET_DEBUG
 	GPIO_PCH_SLP_SX_L,         /* SLP_S0IX# signal from PCH */
 	GPIO_PCH_SUS_STAT_L,       /* SUS_STAT# signal from PCH */
 	GPIO_PCH_SUSPWRDNACK,      /* SUSPWRDNACK signal from PCH */
+#endif
 	GPIO_PP1000_S0IX_PGOOD,    /* Power good on 1.00V (S0iX supplies) */
 	GPIO_USB1_OC_L,            /* USB port overcurrent warning */
 	GPIO_USB2_OC_L,            /* USB port overcurrent warning */
@@ -141,9 +143,11 @@ enum power_signal {
 	X86_PGOOD_PP1000_S0IX,
 	X86_SLP_S3_DEASSERTED,
 	X86_SLP_S4_DEASSERTED,
+#ifdef CONFIG_CHIPSET_DEBUG
 	X86_SLP_SX_DEASSERTED,
 	X86_SUS_STAT_ASSERTED,
 	X86_SUSPWRDNACK_ASSERTED,
+#endif
 
 	/* Number of X86 signals */
 	POWER_SIGNAL_COUNT
diff --git a/include/config.h b/include/config.h
index a95f38e94b..4950c0ba5a 100644
--- a/include/config.h
+++ b/include/config.h
@@ -225,13 +225,16 @@
 #undef CONFIG_CHIPSET_IVYBRIDGE /* Intel Ivy Bridge (x86) */
 #undef CONFIG_CHIPSET_TEGRA     /* nVidia Tegra 5 */
 
+/* Support chipset throttling */
+#undef CONFIG_CHIPSET_CAN_THROTTLE
+
+/* Enable additional chipset debugging */
+#undef CONFIG_CHIPSET_DEBUG
+
 /* Support power rail control */
 #define CONFIG_CHIPSET_HAS_PP1350
 #define CONFIG_CHIPSET_HAS_PP5000
 
-/* Support chipset throttling */
-#undef CONFIG_CHIPSET_CAN_THROTTLE
-
 /*****************************************************************************/
 /*
  * Optional console commands