samus: changes from bringup to boot

These were the changes from bringup to get the first boards
booting successfully.

Mostly minor stuff, some may not be entirely correct still.
- disable internal clkrun so it behaves the same as other
boards, this can be experiemented with later but is too much
extra change during bringup
- enable 1.8V internal pullup since it is missing external
- wait for 1.5V and 1.2V PGOOD to ensure 5V rail is up
- turn on 3.3V DSW rail in S5, it can be disabled later at
runtime in theory but it is required for booting
- turn on USB in S3
- specific wireless bringup sequencing, WLAN power should
be first but the generic wireless function does it in the
other order.

BUG=chrome-os-partner:23449
BRANCH=samus
TEST=emerge-samus chromeos-ec

Change-Id: I698438f21651ce001e74790855bb7f7260d8bdaf
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/173834
Reviewed-by: Randall Spangler <rspangler@chromium.org>

3 files changed, 32 insertions, 13 deletions

diff --git a/board/samus/board.c b/board/samus/board.c
index f729ce46f8..7ed634a2ed 100644
--- a/board/samus/board.c
+++ b/board/samus/board.c
@@ -54,7 +54,7 @@ const struct gpio_info gpio_list[] = {
 	 x86_interrupt},
 	{"PP1200_PGOOD",         LM4_GPIO_H, (1<<6), GPIO_INT_BOTH,
 	 x86_interrupt},
-	{"PP1800_PGOOD",         LM4_GPIO_L, (1<<7), GPIO_INT_BOTH,
+	{"PP1800_PGOOD",         LM4_GPIO_L, (1<<7), GPIO_PULL_UP|GPIO_INT_BOTH,
 	 x86_interrupt},
 	{"VCORE_PGOOD",          LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
 	 x86_interrupt},
diff --git a/board/samus/board.h b/board/samus/board.h
index d19c744def..5c53316f30 100644
--- a/board/samus/board.h
+++ b/board/samus/board.h
@@ -12,7 +12,7 @@
 #define CONFIG_CONSOLE_CMDHELP
 #define CONFIG_TASK_PROFILING
 
-#define HEY_USE_BUILTIN_CLKRUN
+#undef HEY_USE_BUILTIN_CLKRUN
 
 /* Optional features */
 #define CONFIG_BOARD_VERSION
diff --git a/board/samus/power_sequence.c b/board/samus/power_sequence.c
index 771906e699..97c718a3d3 100644
--- a/board/samus/power_sequence.c
+++ b/board/samus/power_sequence.c
@@ -14,6 +14,7 @@
 #include "lid_switch.h"
 #include "registers.h"
 #include "system.h"
+#include "task.h"
 #include "timer.h"
 #include "util.h"
 #include "wireless.h"
@@ -42,6 +43,10 @@
 #define IN_PGOOD_S3          (IN_PGOOD_PP1200 | IN_PGOOD_PP1800)
 /* Rails required for S0 */
 #define IN_PGOOD_S0          (IN_PGOOD_ALL_NONCORE)
+/* Rails used to detect if PP5000 is up. 1.8V PGOOD is not
+ * a reliable signal to use here with an internal pullup. */
+#define IN_PGOOD_PP5000	     (IN_PGOOD_PP1050 | IN_PGOOD_PP1200)
+
 
 /* All PM_SLP signals from PCH deasserted */
 #define IN_ALL_PM_SLP_DEASSERTED (IN_PCH_SLP_S3_DEASSERTED | \
@@ -193,6 +198,19 @@ enum x86_state x86_handle_state(enum x86_state state)
 		 * rail to regulate properly. */
 		gpio_set_level(GPIO_PP5000_EN, 1);
 
+		/* Wait for PP1050/PP1200 PGOOD to go LOW to
+		 * indicate that PP5000 is stable */
+		while ((x86_get_signals() & IN_PGOOD_PP5000) != 0) {
+			if (task_wait_event(SECOND) == TASK_EVENT_TIMER) {
+				CPRINTF("[%T timeout waiting for PP5000\n");
+				chipset_force_shutdown();
+				return X86_G3;
+			}
+		}
+
+		/* Turn on 3.3V DSW rail. */
+		gpio_set_level(GPIO_PP3300_DSW_GATED_EN, 1);
+
 		/* Assert DPWROK */
 		gpio_set_level(GPIO_PCH_DPWROK, 1);
 
@@ -212,8 +230,8 @@ enum x86_state x86_handle_state(enum x86_state state)
 
 	case X86_S5S3:
 		/* Turn on power to RAM */
-		gpio_set_level(GPIO_PP1200_EN, 1);
 		gpio_set_level(GPIO_PP1800_EN, 1);
+		gpio_set_level(GPIO_PP1200_EN, 1);
 		if (x86_wait_signals(IN_PGOOD_S3)) {
 			chipset_force_shutdown();
 			return X86_S5;
@@ -232,19 +250,20 @@ enum x86_state x86_handle_state(enum x86_state state)
 		 */
 		gpio_set_level(GPIO_ENABLE_TOUCHPAD, 1);
 
+		/* Turn on USB power rail. */
+		gpio_set_level(GPIO_PP5000_USB_EN, 1);
+
 		/* Call hooks now that rails are up */
 		hook_notify(HOOK_CHIPSET_STARTUP);
 		return X86_S3;
 
 	case X86_S3S0:
 		/* Wait 20ms before allowing VCCST_PGOOD to rise. */
-		msleep(20);	   /* HEY: really? */
+		msleep(20);
 
-		/* Turn on power rails */
-		gpio_set_level(GPIO_PP3300_DSW_GATED_EN, 1);
-		gpio_set_level(GPIO_PP5000_USB_EN, 1);
-
-		/* Enable wireless */
+		/* Enable wireless, WLAN power first */
+		wireless_enable(EC_WIRELESS_SWITCH_WLAN_POWER);
+		msleep(1);
 		wireless_enable(EC_WIRELESS_SWITCH_ALL);
 
 		/*
@@ -258,8 +277,6 @@ enum x86_state x86_handle_state(enum x86_state state)
 		if (x86_wait_signals(IN_PGOOD_S0)) {
 			chipset_force_shutdown();
 			wireless_enable(0);
-			gpio_set_level(GPIO_PP3300_DSW_GATED_EN, 0);
-			gpio_set_level(GPIO_PP5000_USB_EN, 0);
 			return X86_S3;
 		}
 
@@ -300,8 +317,6 @@ enum x86_state x86_handle_state(enum x86_state state)
 		 */
 		gpio_set_level(GPIO_CPU_PROCHOT, 0);
 
-		/* Turn off power rails */
-		gpio_set_level(GPIO_PP3300_DSW_GATED_EN, 0);
 		return X86_S3;
 
 	case X86_S3S5:
@@ -334,7 +349,11 @@ enum x86_state x86_handle_state(enum x86_state state)
 	case X86_S5G3:
 		/* Deassert DPWROK */
 		gpio_set_level(GPIO_PCH_DPWROK, 0);
+
+		/* Turn off power rails enabled in S5 */
 		gpio_set_level(GPIO_PP1050_EN, 0);
+		gpio_set_level(GPIO_PP3300_DSW_GATED_EN, 0);
+		gpio_set_level(GPIO_PP5000_EN, 0);
 		return X86_G3;
 	}