diff options
| author | Michael Niewöhner <foss@mniewoehner.de> | 2021-09-16 19:12:38 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-09-23 06:31:28 +0000 |
| commit | 74da5f1e7451c80b8a8420dc79d825074c6ca823 (patch) | |
| tree | 19747d79bdae4694995489bf0c660852f184e89b | |
| parent | 374a8b865ccd762381d953644446ec084effd739 (diff) | |
soc/intel/icl: add missing gpio group to fix the group indexes
There is another gpio group, namely HVCMOS, between GPP_C and GPP_E. Add
it, so the group index calculation for GPI/SMI/NMI results in the
correct value.
Reference: Linux linux/drivers/pinctrl/intel/pinctrl-icelake.c
Change-Id: I7725191173ddc0d43bbe940cdf3b0dc2aa3e5f8d
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57719
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
| -rw-r--r-- | src/soc/intel/icelake/gpio.c | 1 | ||||
| -rw-r--r-- | src/soc/intel/icelake/include/soc/gpio_soc_defs.h | 90 |
2 files changed, 50 insertions, 41 deletions
diff --git a/src/soc/intel/icelake/gpio.c b/src/soc/intel/icelake/gpio.c index 09de609a8a..3ee17e6754 100644 --- a/src/soc/intel/icelake/gpio.c +++ b/src/soc/intel/icelake/gpio.c @@ -51,6 +51,7 @@ static const struct pad_group icl_community2_groups[] = { static const struct pad_group icl_community4_groups[] = { INTEL_GPP_BASE(GPP_C0, GPP_C0, GPP_C23, 224), /* GPP_C */ + INTEL_GPP(GPP_C0, EDP_BKLTEN, MLK_RST_B), /* HVCMOS */ INTEL_GPP_BASE(GPP_C0, GPP_E0, GPP_E23, 256), /* GPP_E */ INTEL_GPP(GPP_C0, GPIO_RSVD_3, GPIO_RSVD_8), }; diff --git a/src/soc/intel/icelake/include/soc/gpio_soc_defs.h b/src/soc/intel/icelake/include/soc/gpio_soc_defs.h index 2a7d4241cd..0e9b4e7a03 100644 --- a/src/soc/intel/icelake/include/soc/gpio_soc_defs.h +++ b/src/soc/intel/icelake/include/soc/gpio_soc_defs.h @@ -214,57 +214,65 @@ #define GPIO_RSVD_7 163 #define GPIO_RSVD_8 164 +/* Group HVCMOS */ +#define EDP_BKLTEN 165 +#define EDP_BKLTCTL 166 +#define EDP_VDDEN 167 +#define SYS_PWROK 168 +#define SYS_RESET_B 169 +#define MLK_RST_B 170 + /* Group E */ -#define GPP_E0 165 -#define GPP_E1 166 -#define GPP_E2 167 -#define GPP_E3 168 -#define GPP_E4 169 -#define GPP_E5 170 -#define GPP_E6 171 -#define GPP_E7 172 -#define GPP_E8 173 -#define GPP_E9 174 -#define GPP_E10 175 -#define GPP_E11 176 -#define GPP_E12 177 -#define GPP_E13 178 -#define GPP_E14 179 -#define GPP_E15 180 -#define GPP_E16 181 -#define GPP_E17 182 -#define GPP_E18 183 -#define GPP_E19 184 -#define GPP_E20 185 -#define GPP_E21 186 -#define GPP_E22 187 -#define GPP_E23 188 +#define GPP_E0 171 +#define GPP_E1 172 +#define GPP_E2 173 +#define GPP_E3 174 +#define GPP_E4 175 +#define GPP_E5 176 +#define GPP_E6 177 +#define GPP_E7 178 +#define GPP_E8 179 +#define GPP_E9 180 +#define GPP_E10 181 +#define GPP_E11 182 +#define GPP_E12 183 +#define GPP_E13 184 +#define GPP_E14 185 +#define GPP_E15 186 +#define GPP_E16 187 +#define GPP_E17 188 +#define GPP_E18 189 +#define GPP_E19 190 +#define GPP_E20 191 +#define GPP_E21 192 +#define GPP_E22 193 +#define GPP_E23 194 #define NUM_GPIO_COM4_PADS (GPP_E23 - GPP_C0 + 1) /* Group R*/ -#define GPP_R0 189 -#define GPP_R1 190 -#define GPP_R2 191 -#define GPP_R3 192 -#define GPP_R4 193 -#define GPP_R5 194 -#define GPP_R6 195 -#define GPP_R7 196 +#define GPP_R0 195 +#define GPP_R1 196 +#define GPP_R2 197 +#define GPP_R3 198 +#define GPP_R4 199 +#define GPP_R5 200 +#define GPP_R6 201 +#define GPP_R7 202 /* Group S */ -#define GPP_S0 197 -#define GPP_S1 198 -#define GPP_S2 199 -#define GPP_S3 200 -#define GPP_S4 201 -#define GPP_S5 202 -#define GPP_S6 203 -#define GPP_S7 204 +#define GPP_S0 203 +#define GPP_S1 204 +#define GPP_S2 205 +#define GPP_S3 206 +#define GPP_S4 207 +#define GPP_S5 208 +#define GPP_S6 209 +#define GPP_S7 210 #define NUM_GPIO_COM5_PADS (GPP_S7 - GPP_R0 + 1) -#define TOTAL_PADS 205 +#define TOTAL_PADS 211 #define COMM_0 0 #define COMM_1 1 |