From f5519f0df39448e796be0ed45874044ff0fa4f34 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 26 Jun 2019 10:36:29 -0600 Subject: [PATCH] Truly fix gpio misccfg values --- .../cannonlake/include/soc/gpio_soc_defs.h | 18 +++++++++--------- .../include/soc/gpio_soc_defs_cnp_h.h | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h index 698bd2a5c7..4b3fbc4bea 100644 --- a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h +++ b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h @@ -26,15 +26,15 @@ #define GPP_B 0x1 #define GPP_G 0x2 #define GROUP_SPI 0x3 -#define GPP_D 0x5 -#define GPP_F 0x6 -#define GPP_H 0x7 -#define GROUP_VGPIO0 0x8 -#define GROUP_VGPIO1 0x9 -#define GPD 0xA -#define GROUP_AZA 0xB -#define GROUP_CPU 0xC -#define GPP_C 0x4 +#define GPP_D 0x4 +#define GPP_F 0x5 +#define GPP_H 0x6 +#define GROUP_VGPIO0 0x7 +#define GROUP_VGPIO1 0x8 +#define GPD 0x9 +#define GROUP_AZA 0xA +#define GROUP_CPU 0xB +#define GPP_C 0xC #define GPP_E 0xD #define GROUP_JTAG 0xE #define GROUP_HVMOS 0xF diff --git a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs_cnp_h.h b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs_cnp_h.h index 5176ac734a..b0fba9e655 100644 --- a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs_cnp_h.h +++ b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs_cnp_h.h @@ -27,13 +27,13 @@ #define GPP_C 2 #define GPP_D 3 #define GPP_G 4 -#define GPP_K 5 -#define GPP_H 6 -#define GPP_E 7 -#define GPP_F 8 -#define GPP_I 9 -#define GPP_J 0xA -#define GPD 0xC +#define GPP_K 9 +#define GPP_H 8 +#define GPP_E 6 +#define GPP_F 7 +#define GPP_I 0xA +#define GPP_J 0xB +#define GPD 5 #define GPIO_NUM_GROUPS 12 #define GPIO_MAX_NUM_PER_GROUP 24