[coreboot-gerrit] New patch to review for coreboot: soc/braswell: Fix for auto wake from S5

[Hannah Williams (hannah.williams@intel.com)]

Hannah Williams (hannah.williams at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13425

-gerrit

commit c61522fa0ad7163cb6c21c032a31720b11b441aa
Author: Hannah Williams <hannah.williams at intel.com>
Date:   Mon Jul 27 19:46:34 2015 -0700

    soc/braswell: Fix for auto wake from S5
    
    Disabling S5 wake from touch panel and trackpad
    
    TEST=Build and boot the platform.
    TEST=Poweroff platform -> enter PG3 -> remove AC -> close Lid
         Plug AC in -> EC boots up and AP will shutdown the platform
         and open Lid -> platform boots to OS.
    
    Change-Id: I7b661a9f1327b97d904bac40e78612648f353e39
    Signed-off-by: Hannah Williams <hannah.williams at intel.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/288970
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Commit-Queue: Divagar Mohandass <divagar.mohandass at intel.com>
    Original-Tested-by: Divagar Mohandass <divagar.mohandass at intel.com>
---
 src/mainboard/google/cyan/smihandler.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/mainboard/google/cyan/smihandler.c b/src/mainboard/google/cyan/smihandler.c
index 04cc899..9b363ca 100644
--- a/src/mainboard/google/cyan/smihandler.c
+++ b/src/mainboard/google/cyan/smihandler.c
@@ -28,6 +28,8 @@
 
 /* The wake gpio is SUS_GPIO[0]. */
 #define WAKE_GPIO_EN SUS_GPIO_EN0
+#define GPIO_SUS7_WAKE_MASK     (1 << 12)
+#define GPIO_SUS1_WAKE_MASK     (1 << 13)
 
 int mainboard_io_trap_handler(int smif)
 {
@@ -96,6 +98,9 @@ void mainboard_smi_gpi(uint32_t alt_gpio_smi)
 
 void mainboard_smi_sleep(uint8_t slp_typ)
 {
+	void		*addr;
+	uint32_t	mask;
+
 	/* Disable USB charging if required */
 	switch (slp_typ) {
 	case 3:
@@ -125,6 +130,16 @@ void mainboard_smi_sleep(uint8_t slp_typ)
 		/* Enable wake events */
 		google_chromeec_set_wake_mask(MAINBOARD_EC_S5_WAKE_EVENTS);
 #endif
+
+		/* Disabling wake from SUS_GPIO1 (TOUCH INT) and
+		 * SUS_GPIO7 (TRACKPAD INT) in North bank as they are not
+		 * valid S5 wake sources
+		 */
+		addr = (void *)(IO_BASE_ADDRESS + COMMUNITY_OFFSET_GPNORTH +
+			GPIO_WAKE_MASK_REG0);
+		mask = ~(GPIO_SUS1_WAKE_MASK | GPIO_SUS7_WAKE_MASK);
+		write32(addr, read32(addr) & mask);
+
 		break;
 	}