summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-06-04 17:40:25 -0700
committerFurquan Shaikh <furquan@google.com>2018-06-06 00:35:19 +0000
commit2c373d69897dd1ba66e7ba72b386a906e9418ed9 (patch)
treeffb061a840ce87fdf5fac6a52c6261eea4835b43 /src/soc
parente9d3b9c0f6b2b070a4caa28d1f516bad04ebf59a (diff)
downloadcoreboot-2c373d69897dd1ba66e7ba72b386a906e9418ed9.tar.xz
soc/intel/apollolake: Add missing entries to pmc_to_gpio_route for GLK
This change adds missing entries in PMC to GPIO route mapping for GLK. BUG=b:77224247 Change-Id: I66cadaa23b8bd4518a199733c8fba81168e60323 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/26853 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/apollolake/gpio_glk.c8
-rw-r--r--src/soc/intel/apollolake/include/soc/pm.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/soc/intel/apollolake/gpio_glk.c b/src/soc/intel/apollolake/gpio_glk.c
index a998118aa9..037273c3fa 100644
--- a/src/soc/intel/apollolake/gpio_glk.c
+++ b/src/soc/intel/apollolake/gpio_glk.c
@@ -131,11 +131,19 @@ const struct pad_community *soc_gpio_get_community(size_t *num_communities)
const struct pmc_to_gpio_route *soc_pmc_gpio_routes(size_t *num)
{
static const struct pmc_to_gpio_route routes[] = {
+ { PMC_GPE_SCC_31_0, GPIO_GPE_SCC_31_0 },
+ { PMC_GPE_SCC_63_32, GPIO_GPE_SCC_63_32 },
{ PMC_GPE_NW_31_0, GPIO_GPE_NW_31_0 },
{ PMC_GPE_NW_63_32, GPIO_GPE_NW_63_32 },
+ { PMC_GPE_NW_95_64, GPIO_GPE_NW_95_64 },
+ /*
+ * PMC_GPE_NW_127_96 maps to GPIO group 3, which is reserved and
+ * cannot be set in GPE0_DWx. Hence, it is skipped here.
+ */
{ PMC_GPE_N_31_0, GPIO_GPE_N_31_0 },
{ PMC_GPE_N_63_32, GPIO_GPE_N_63_32 },
{ PMC_GPE_N_95_64, GPIO_GPE_N_95_64 },
+ { PMC_GPE_AUDIO_31_0, GPIO_GPE_AUDIO_31_0 },
};
*num = ARRAY_SIZE(routes);
return routes;
diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h
index e8ec645b1f..6de39a068c 100644
--- a/src/soc/intel/apollolake/include/soc/pm.h
+++ b/src/soc/intel/apollolake/include/soc/pm.h
@@ -196,6 +196,7 @@
#define GPE0_DW_SHIFT(x) (4 + 4*(x))
#if IS_ENABLED(CONFIG_SOC_INTEL_GLK)
+#define PMC_GPE_AUDIO_31_0 9
#define PMC_GPE_N_95_64 8
#define PMC_GPE_N_63_32 7
#define PMC_GPE_N_31_0 6