diff options
author | Duncan Laurie <dlaurie@chromium.org> | 2013-10-22 16:37:39 -0700 |
---|---|---|
committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-09-08 19:05:50 +0200 |
commit | 33e295e66fe6fa5d7f2fead3bbbe30b6bfd5dca4 (patch) | |
tree | d98c8e1bfe87e74ba79b8992f5ac65a598ecf669 /src/mainboard/google/samus/smihandler.c | |
parent | fe74092c4e802efbed76804fb43f0bd25a5721b2 (diff) |
samus: Tweaks from bringup
- GPIO29 is no longer connected so we don't need the SMI workaround
on the entry to sleep states.
- Disable touchscreen wake source until the kernel driver is working
so it does not wake immediately.
- Update a few GPIOs and disable the codec for now as it is leaking
into the 1.8V DDR rail.
Change-Id: Ia67b17eb4a097627befd8f39aadc939da1bf3d40
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/174122
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
(cherry picked from commit 0fdc9a83a434378499f825d072ce0adba5ffda59)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6829
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/google/samus/smihandler.c')
-rw-r--r-- | src/mainboard/google/samus/smihandler.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/mainboard/google/samus/smihandler.c b/src/mainboard/google/samus/smihandler.c index 7cbe9d67c0..a525f16bb6 100644 --- a/src/mainboard/google/samus/smihandler.c +++ b/src/mainboard/google/samus/smihandler.c @@ -92,26 +92,6 @@ void mainboard_smi_gpi(u32 gpi_sts) } } -static void mainboard_wlan_off(void) -{ - u16 gpio_base = pci_read_config16(PCH_LPC_DEV, GPIO_BASE) & 0xfffc; - u32 gpio_conf; - - /* Make sure pin is owned by GPIO subsystem and not ACPI */ - gpio_conf = inl(gpio_base + GPIO_OWNER(0)); - gpio_conf |= GPIO_OWNER_GPIO << 29; - outl(gpio_conf, gpio_base + GPIO_OWNER(0)); - - /* Set GPIO29 config to only be reset on RSMRST */ - gpio_conf = inl(gpio_base + GPIO_RESET(0)); - gpio_conf |= GPIO_RESET_RSMRST << 29; - outl(gpio_conf, gpio_base + GPIO_RESET(0)); - - /* Set WLAN_OFF_L (GPIO29) as Output GPIO driven high */ - gpio_conf = GPIO_MODE_GPIO | GPIO_DIR_OUTPUT | GPO_LEVEL_HIGH; - outl(gpio_conf, gpio_base + GPIO_CONFIG0(29)); -} - void mainboard_smi_sleep(u8 slp_typ) { /* Disable USB charging if required */ @@ -150,9 +130,6 @@ void mainboard_smi_sleep(u8 slp_typ) break; } - /* Set WLAN_OFF GPIO state */ - mainboard_wlan_off(); - /* Disable SCI and SMI events */ google_chromeec_set_smi_mask(0); google_chromeec_set_sci_mask(0); |