<p>Lijian Zhao has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22908">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/cannonlake: Correct PMC/GPIO routing information<br><br>PMC and GPIO DWx definition is not identical, hence update that to<br>correct information. For cannonlake lp PCH, GPIO group C, group E and<br>group GPD is different for PMC GPIO_CFG and GPIO MISCCFG.<br><br>TEST=Boot up into OS, and manually check PMC GPE status<br><br>Change-Id: I1edb83edabc72e8a762b129cf51dcd936cd37ddf<br>Signed-off-by: Lijian Zhao <lijian.zhao@intel.com><br>---<br>M src/soc/intel/cannonlake/gpio.c<br>M src/soc/intel/cannonlake/include/soc/pmc.h<br>2 files changed, 20 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/22908/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/intel/cannonlake/gpio.c b/src/soc/intel/cannonlake/gpio.c<br>index de60fa3..1227f4b 100644<br>--- a/src/soc/intel/cannonlake/gpio.c<br>+++ b/src/soc/intel/cannonlake/gpio.c<br>@@ -17,6 +17,7 @@<br> #include <intelblocks/gpio.h><br> #include <intelblocks/pcr.h><br> #include <soc/pcr_ids.h><br>+#include <soc/pmc.h><br> <br> #define CNL_GPP(s, e)                           \<br>     {                                               \<br>@@ -160,15 +161,15 @@<br> const struct pmc_to_gpio_route *soc_pmc_gpio_routes(size_t *num)<br> {<br>       static const struct pmc_to_gpio_route routes[] = {<br>-           { GPP_A, GPP_A },<br>-            { GPP_B, GPP_B },<br>-            { GPP_C, GPP_C },<br>-            { GPP_D, GPP_D },<br>-            { GPP_E, GPP_E },<br>-            { GPP_F, GPP_F },<br>-            { GPP_G, GPP_G },<br>-            { GPP_H, GPP_H },<br>-            { GPD, GPD },<br>+                { PMC_GPP_A, GPP_A },<br>+                { PMC_GPP_B, GPP_B },<br>+                { PMC_GPP_C, GPP_C },<br>+                { PMC_GPP_D, GPP_D },<br>+                { PMC_GPP_E, GPP_E },<br>+                { PMC_GPP_F, GPP_F },<br>+                { PMC_GPP_G, GPP_G },<br>+                { PMC_GPP_H, GPP_H },<br>+                { PMC_GPD, GPD },<br>     };<br>    *num = ARRAY_SIZE(routes);<br>    return routes;<br>diff --git a/src/soc/intel/cannonlake/include/soc/pmc.h b/src/soc/intel/cannonlake/include/soc/pmc.h<br>index 0276d46..12b90d6 100644<br>--- a/src/soc/intel/cannonlake/include/soc/pmc.h<br>+++ b/src/soc/intel/cannonlake/include/soc/pmc.h<br>@@ -116,6 +116,16 @@<br> #define  GPE0_DWX_MASK                  0xf<br> #define  GPE0_DW_SHIFT(x)         (4*(x))<br> <br>+#define  PMC_GPP_A                 0<br>+#define  PMC_GPP_B                  1<br>+#define  PMC_GPP_C                  0xD<br>+#define  PMC_GPP_D                        4<br>+#define  PMC_GPP_E                  0xE<br>+#define  PMC_GPP_F                        5<br>+#define  PMC_GPP_G                  2<br>+#define  PMC_GPP_H                  6<br>+#define  PMC_GPD                    0xA<br>+<br> #define GBLRST_CAUSE0                  0x1924<br> #define   GBLRST_CAUSE0_THERMTRIP      (1 << 5)<br> #define GBLRST_CAUSE1                  0x1928<br></pre><p>To view, visit <a href="https://review.coreboot.org/22908">change 22908</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22908"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I1edb83edabc72e8a762b129cf51dcd936cd37ddf </div>
<div style="display:none"> Gerrit-Change-Number: 22908 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Lijian Zhao <lijian.zhao@intel.com> </div>