From a778237948d2ec72ed548091103a0d2eff916732 Mon Sep 17 00:00:00 2001 From: Bora Guvendik Date: Wed, 15 Nov 2017 16:11:17 -0800 Subject: soc/intel/cannonlake: fix gpio pin numbers Update pin numbers to match kernel cannonlake pinctrl driver. TEST=boot to OS Change-Id: Id65736db03200fd434dd9292ce081727abd6832b Signed-off-by: Bora Guvendik Reviewed-on: https://review.coreboot.org/22477 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- .../intel/cannonlake/include/soc/gpio_soc_defs.h | 334 +++++++++++---------- 1 file changed, 169 insertions(+), 165 deletions(-) (limited to 'src/soc') 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 d4994e74e4..061e6975fc 100644 --- a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h +++ b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h @@ -64,189 +64,193 @@ #define GPP_A21 21 #define GPP_A22 22 #define GPP_A23 23 +#define ESPI_CLK_LOOPBK 24 /* Group B */ -#define GPP_B0 24 -#define GPP_B1 25 -#define GPP_B2 26 -#define GPP_B3 27 -#define GPP_B4 28 -#define GPP_B5 29 -#define GPP_B6 30 -#define GPP_B7 31 -#define GPP_B8 32 -#define GPP_B9 33 -#define GPP_B10 34 -#define GPP_B11 35 -#define GPP_B12 36 -#define GPP_B13 37 -#define GPP_B14 38 -#define GPP_B15 39 -#define GPP_B16 40 -#define GPP_B17 41 -#define GPP_B18 42 -#define GPP_B19 43 -#define GPP_B20 44 -#define GPP_B21 45 -#define GPP_B22 46 -#define GPP_B23 47 +#define GPP_B0 25 +#define GPP_B1 26 +#define GPP_B2 27 +#define GPP_B3 28 +#define GPP_B4 29 +#define GPP_B5 30 +#define GPP_B6 31 +#define GPP_B7 32 +#define GPP_B8 33 +#define GPP_B9 34 +#define GPP_B10 35 +#define GPP_B11 36 +#define GPP_B12 37 +#define GPP_B13 38 +#define GPP_B14 39 +#define GPP_B15 40 +#define GPP_B16 41 +#define GPP_B17 42 +#define GPP_B18 43 +#define GPP_B19 44 +#define GPP_B20 45 +#define GPP_B21 46 +#define GPP_B22 47 +#define GPP_B23 48 +#define GSPI0_CLK_LOOPBK 49 +#define GSPI1_CLK_LOOPBK 50 /* Group G */ -#define GPP_G0 48 -#define GPP_G1 49 -#define GPP_G2 50 -#define GPP_G3 51 -#define GPP_G4 52 -#define GPP_G5 53 -#define GPP_G6 54 -#define GPP_G7 55 +#define GPP_G0 51 +#define GPP_G1 52 +#define GPP_G2 53 +#define GPP_G3 54 +#define GPP_G4 55 +#define GPP_G5 56 +#define GPP_G6 57 +#define GPP_G7 58 #define NUM_GPIO_COM0_PADS (GPP_G7 - GPP_A0 + 1) /* Group D */ -#define GPP_D0 56 -#define GPP_D1 57 -#define GPP_D2 58 -#define GPP_D3 59 -#define GPP_D4 60 -#define GPP_D5 61 -#define GPP_D6 62 -#define GPP_D7 63 -#define GPP_D8 64 -#define GPP_D9 65 -#define GPP_D10 66 -#define GPP_D11 67 -#define GPP_D12 68 -#define GPP_D13 69 -#define GPP_D14 70 -#define GPP_D15 71 -#define GPP_D16 72 -#define GPP_D17 73 -#define GPP_D18 74 -#define GPP_D19 75 -#define GPP_D20 76 -#define GPP_D21 77 -#define GPP_D22 78 -#define GPP_D23 79 +#define GPP_D0 68 +#define GPP_D1 69 +#define GPP_D2 70 +#define GPP_D3 71 +#define GPP_D4 72 +#define GPP_D5 73 +#define GPP_D6 74 +#define GPP_D7 75 +#define GPP_D8 76 +#define GPP_D9 77 +#define GPP_D10 78 +#define GPP_D11 79 +#define GPP_D12 80 +#define GPP_D13 81 +#define GPP_D14 82 +#define GPP_D15 83 +#define GPP_D16 84 +#define GPP_D17 85 +#define GPP_D18 86 +#define GPP_D19 87 +#define GPP_D20 88 +#define GPP_D21 89 +#define GPP_D22 90 +#define GPP_D23 91 +#define GSPI2_CLK_LOOPBK 92 /* Group F */ -#define GPP_F0 80 -#define GPP_F1 81 -#define GPP_F2 82 -#define GPP_F3 83 -#define GPP_F4 84 -#define GPP_F5 85 -#define GPP_F6 86 -#define GPP_F7 87 -#define GPP_F8 88 -#define GPP_F9 89 -#define GPP_F10 90 -#define GPP_F11 91 -#define GPP_F12 92 -#define GPP_F13 93 -#define GPP_F14 94 -#define GPP_F15 95 -#define GPP_F16 96 -#define GPP_F17 97 -#define GPP_F18 98 -#define GPP_F19 99 -#define GPP_F20 100 -#define GPP_F21 101 -#define GPP_F22 102 -#define GPP_F23 103 +#define GPP_F0 93 +#define GPP_F1 94 +#define GPP_F2 95 +#define GPP_F3 96 +#define GPP_F4 97 +#define GPP_F5 98 +#define GPP_F6 99 +#define GPP_F7 100 +#define GPP_F8 101 +#define GPP_F9 102 +#define GPP_F10 103 +#define GPP_F11 104 +#define GPP_F12 105 +#define GPP_F13 106 +#define GPP_F14 107 +#define GPP_F15 108 +#define GPP_F16 109 +#define GPP_F17 110 +#define GPP_F18 111 +#define GPP_F19 112 +#define GPP_F20 113 +#define GPP_F21 114 +#define GPP_F22 115 +#define GPP_F23 116 /* Group H */ -#define GPP_H0 104 -#define GPP_H1 105 -#define GPP_H2 106 -#define GPP_H3 107 -#define GPP_H4 108 -#define GPP_H5 109 -#define GPP_H6 110 -#define GPP_H7 111 -#define GPP_H8 112 -#define GPP_H9 113 -#define GPP_H10 114 -#define GPP_H11 115 -#define GPP_H12 116 -#define GPP_H13 117 -#define GPP_H14 118 -#define GPP_H15 119 -#define GPP_H16 120 -#define GPP_H17 121 -#define GPP_H18 122 -#define GPP_H19 123 -#define GPP_H20 124 -#define GPP_H21 125 -#define GPP_H22 126 -#define GPP_H23 127 +#define GPP_H0 117 +#define GPP_H1 118 +#define GPP_H2 119 +#define GPP_H3 120 +#define GPP_H4 121 +#define GPP_H5 122 +#define GPP_H6 123 +#define GPP_H7 124 +#define GPP_H8 125 +#define GPP_H9 126 +#define GPP_H10 127 +#define GPP_H11 128 +#define GPP_H12 129 +#define GPP_H13 130 +#define GPP_H14 131 +#define GPP_H15 132 +#define GPP_H16 133 +#define GPP_H17 134 +#define GPP_H18 135 +#define GPP_H19 136 +#define GPP_H20 137 +#define GPP_H21 138 +#define GPP_H22 139 +#define GPP_H23 140 #define NUM_GPIO_COM1_PADS (GPP_H23 - GPP_D0 + 1) /* Group C */ -#define GPP_C0 128 -#define GPP_C1 129 -#define GPP_C2 130 -#define GPP_C3 131 -#define GPP_C4 132 -#define GPP_C5 133 -#define GPP_C6 134 -#define GPP_C7 135 -#define GPP_C8 136 -#define GPP_C9 137 -#define GPP_C10 138 -#define GPP_C11 139 -#define GPP_C12 140 -#define GPP_C13 141 -#define GPP_C14 142 -#define GPP_C15 143 -#define GPP_C16 144 -#define GPP_C17 145 -#define GPP_C18 146 -#define GPP_C19 147 -#define GPP_C20 148 -#define GPP_C21 149 -#define GPP_C22 150 -#define GPP_C23 151 +#define GPP_C0 181 +#define GPP_C1 182 +#define GPP_C2 183 +#define GPP_C3 184 +#define GPP_C4 185 +#define GPP_C5 186 +#define GPP_C6 187 +#define GPP_C7 188 +#define GPP_C8 189 +#define GPP_C9 190 +#define GPP_C10 191 +#define GPP_C11 192 +#define GPP_C12 193 +#define GPP_C13 194 +#define GPP_C14 195 +#define GPP_C15 196 +#define GPP_C16 197 +#define GPP_C17 198 +#define GPP_C18 199 +#define GPP_C19 200 +#define GPP_C20 201 +#define GPP_C21 202 +#define GPP_C22 203 +#define GPP_C23 204 /* Group E */ -#define GPP_E0 152 -#define GPP_E1 153 -#define GPP_E2 154 -#define GPP_E3 155 -#define GPP_E4 156 -#define GPP_E5 157 -#define GPP_E6 158 -#define GPP_E7 159 -#define GPP_E8 160 -#define GPP_E9 161 -#define GPP_E10 162 -#define GPP_E11 163 -#define GPP_E12 164 -#define GPP_E13 165 -#define GPP_E14 166 -#define GPP_E15 167 -#define GPP_E16 168 -#define GPP_E17 169 -#define GPP_E18 170 -#define GPP_E19 171 -#define GPP_E20 172 -#define GPP_E21 173 -#define GPP_E22 174 -#define GPP_E23 175 +#define GPP_E0 205 +#define GPP_E1 206 +#define GPP_E2 207 +#define GPP_E3 208 +#define GPP_E4 209 +#define GPP_E5 210 +#define GPP_E6 211 +#define GPP_E7 212 +#define GPP_E8 213 +#define GPP_E9 214 +#define GPP_E10 215 +#define GPP_E11 216 +#define GPP_E12 217 +#define GPP_E13 218 +#define GPP_E14 219 +#define GPP_E15 220 +#define GPP_E16 221 +#define GPP_E17 222 +#define GPP_E18 223 +#define GPP_E19 224 +#define GPP_E20 225 +#define GPP_E21 226 +#define GPP_E22 227 +#define GPP_E23 228 #define NUM_GPIO_COM3_PADS (GPP_E23 - GPP_C0 + 1) /* Group GPD */ -#define GPD0 176 -#define GPD1 177 -#define GPD2 178 -#define GPD3 179 -#define GPD4 180 -#define GPD5 181 -#define GPD6 182 -#define GPD7 183 -#define GPD8 184 -#define GPD9 185 -#define GPD10 186 -#define GPD11 187 +#define GPD0 229 +#define GPD1 230 +#define GPD2 231 +#define GPD3 232 +#define GPD4 233 +#define GPD5 234 +#define GPD6 235 +#define GPD7 236 +#define GPD8 237 +#define GPD9 238 +#define GPD10 239 +#define GPD11 240 #define NUM_GPIO_COM2_PADS (GPD11 - GPD0 + 1) -#define TOTAL_PADS 188 +#define TOTAL_PADS 241 #endif -- cgit v1.2.3