diff options
author | Venkateswarlu Vinjamuri <venkateswarlu.v.vinjamuri@intel.com> | 2017-03-22 18:24:52 -0700 |
---|---|---|
committer | Furquan Shaikh <furquan@google.com> | 2017-04-13 19:50:34 +0200 |
commit | 99ce8a9bba091f9f57e46c48fa1493525c77b373 (patch) | |
tree | 9d0eb54b0f803fbed3280e36d0ac1372c8601e7e /src/soc/intel/apollolake/include | |
parent | 9c30d06bfc3ab70234b79922c0603f9a67fe4f0f (diff) |
soc/intel/apollolake: Set sdcard card detect (CD) host ownership
Currently sdcard CD host ownership is always owned by the GPIO driver.
Due to this sdcard detection fails during initial boot process and OS
fails to boot from sdcard.
This implements change in host ownership from acpi to GPIO driver when
kernel starts booting.
BUG=b:35648535
TEST=Check OS boot from sdcard.
Change-Id: I042a8762dc1f9cb73e6a24c1e7169c9746b2ee14
Signed-off-by: Venkateswarlu Vinjamuri <venkateswarlu.v.vinjamuri@intel.com>
Reviewed-on: https://review.coreboot.org/18947
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Vaibhav Shankar <vaibhav.shankar@intel.com>
Diffstat (limited to 'src/soc/intel/apollolake/include')
-rw-r--r-- | src/soc/intel/apollolake/include/soc/gpio.h | 4 | ||||
-rw-r--r-- | src/soc/intel/apollolake/include/soc/nvs.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/soc/intel/apollolake/include/soc/gpio.h b/src/soc/intel/apollolake/include/soc/gpio.h index bdd39944d1..f1020f630a 100644 --- a/src/soc/intel/apollolake/include/soc/gpio.h +++ b/src/soc/intel/apollolake/include/soc/gpio.h @@ -162,6 +162,10 @@ void gpio_configure_pads(const struct pad_config *cfg, size_t num_pads); /* Calculate GPIO DW0 address */ void *gpio_dwx_address(const uint16_t pad); + +/* Get the port id of given pad */ +uint8_t gpio_get_pad_portid(const uint16_t pad); + /* * Set the GPIO groups for the GPE blocks. The values from PMC register GPE_CFG * are passed which is then mapped to proper groups for MISCCFG. This basically diff --git a/src/soc/intel/apollolake/include/soc/nvs.h b/src/soc/intel/apollolake/include/soc/nvs.h index 21ac14e274..f9cc49d3ff 100644 --- a/src/soc/intel/apollolake/include/soc/nvs.h +++ b/src/soc/intel/apollolake/include/soc/nvs.h @@ -39,8 +39,9 @@ typedef struct global_nvs_t { uint64_t nhla; /* 0x19 - 0x20 - NHLT Address */ uint32_t nhll; /* 0x21 - 0x24 - NHLT Length */ uint32_t prt0; /* 0x25 - 0x28 - PERST_0 Address */ - uint32_t scd0; /* 0x29 - 0x2D - SD_CD Address */ - uint8_t unused[211]; + uint8_t scdp; /* 0x29 - SD_CD GPIO portid */ + uint8_t scdo; /* 0x2A - GPIO pad offset relative to the community */ + uint8_t unused[213]; /* ChromeOS specific (0x100 - 0xfff) */ chromeos_acpi_t chromeos; |