summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/jasperlake/gpio.c7
-rw-r--r--src/soc/intel/jasperlake/include/soc/pmc.h17
2 files changed, 13 insertions, 11 deletions
diff --git a/src/soc/intel/jasperlake/gpio.c b/src/soc/intel/jasperlake/gpio.c
index 3b3b262996..22e73da195 100644
--- a/src/soc/intel/jasperlake/gpio.c
+++ b/src/soc/intel/jasperlake/gpio.c
@@ -182,14 +182,15 @@ const struct pmc_to_gpio_route *soc_pmc_gpio_routes(size_t *num)
static const struct pmc_to_gpio_route routes[] = {
{ PMC_GPP_A, GPP_A },
{ PMC_GPP_B, GPP_B },
+ { PMC_GPP_G, GPP_G },
+ { PMC_GPP_C, GPP_C },
{ PMC_GPP_R, GPP_R },
{ PMC_GPP_D, GPP_D },
{ PMC_GPP_S, GPP_S },
{ PMC_GPP_H, GPP_H },
+ { PMC_GPP_F, GPP_F },
{ PMC_GPD, GPP_GPD },
- { PMC_GPP_C, GPP_C },
- { PMC_GPP_E, GPP_E },
- { PMC_GPP_F, GPP_F }
+ { PMC_GPP_E, GPP_E }
};
*num = ARRAY_SIZE(routes);
diff --git a/src/soc/intel/jasperlake/include/soc/pmc.h b/src/soc/intel/jasperlake/include/soc/pmc.h
index 5954a3115d..9eaa812ce4 100644
--- a/src/soc/intel/jasperlake/include/soc/pmc.h
+++ b/src/soc/intel/jasperlake/include/soc/pmc.h
@@ -102,16 +102,17 @@
#define GPE0_DWX_MASK 0xf
#define GPE0_DW_SHIFT(x) (4*(x))
-#define PMC_GPP_A 0x0
+#define PMC_GPP_G 0x0
#define PMC_GPP_B 0x1
-#define PMC_GPP_F 0x2
-#define PMC_GPD 0x3
-#define PMC_GPP_R 0x4
-#define PMC_GPP_S 0x6
+#define PMC_GPP_A 0x2
+#define PMC_GPP_R 0x3
+#define PMC_GPP_S 0x4
+#define PMC_GPD 0x5
+#define PMC_GPP_H 0x6
#define PMC_GPP_D 0x7
-#define PMC_GPP_C 0x8
-#define PMC_GPP_H 0xA
-#define PMC_GPP_E 0xF
+#define PMC_GPP_F 0x8
+#define PMC_GPP_C 0xA
+#define PMC_GPP_E 0xB
#define GBLRST_CAUSE0 0x1924
#define GBLRST_CAUSE0_THERMTRIP (1 << 5)