rambi: Remove ignored PCH signals

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.

Orig-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>
(cherry picked from commit b805917e43ec2912404892aede64a1265201a4a4)

Change-Id: I6459bd7f544755915ac7c5f0b986a8faab1f3555
Reviewed-on: https://chromium-review.googlesource.com/188538
Commit-Queue: Randall Spangler <rspangler@chromium.org>
Tested-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Dave Parker <dparker@chromium.org>

11 files changed, 46 insertions, 3 deletions

diff --git a/board/clapper/board.c b/board/clapper/board.c
index 16de022a2f..cf2e1d70a9 100644
--- a/board/clapper/board.c
+++ b/board/clapper/board.c
@@ -77,12 +77,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},
@@ -149,9 +151,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/clapper/board.h b/board/clapper/board.h
index 1bc2826786..09660538f8 100644
--- a/board/clapper/board.h
+++ b/board/clapper/board.h
@@ -94,9 +94,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 */
@@ -149,9 +151,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/glimmer/board.c b/board/glimmer/board.c
index 4a9f675ed1..e5e2a9e340 100644
--- a/board/glimmer/board.c
+++ b/board/glimmer/board.c
@@ -95,12 +95,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},
@@ -166,9 +168,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/glimmer/board.h b/board/glimmer/board.h
index a362e6e993..765257f80b 100644
--- a/board/glimmer/board.h
+++ b/board/glimmer/board.h
@@ -98,9 +98,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 */
@@ -152,9 +154,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/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 5faac20d5b..2bc13ac64f 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 */
@@ -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/board/squawks/board.c b/board/squawks/board.c
index c5d7d96572..e73772adcf 100644
--- a/board/squawks/board.c
+++ b/board/squawks/board.c
@@ -70,12 +70,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},
@@ -138,9 +140,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 c84449379a..411d676626 100644
--- a/board/squawks/board.h
+++ b/board/squawks/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 */
@@ -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/board/winky/board.c b/board/winky/board.c
index 58680d89bd..4b2e2b918d 100644
--- a/board/winky/board.c
+++ b/board/winky/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/winky/board.h b/board/winky/board.h
index 2511eca6ec..5bc42dbe88 100644
--- a/board/winky/board.h
+++ b/board/winky/board.h
@@ -90,9 +90,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 */
@@ -143,9 +145,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 eeada9b188..224910cce2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -223,13 +223,16 @@
 /* Compile common x86 chipset infrastructure.  Required for x86 chips. */
 #undef CONFIG_CHIPSET_X86
 
+/* 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