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