Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: denverton: Update pin names according to v1.08

Version 1.08 of pin list has some changes in pin names for Intel Denverton.

Update the driver accordingly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

+25 -24
+25 -24
drivers/pinctrl/intel/pinctrl-denverton.c
··· 41 41 .ngpps = ARRAY_SIZE(g), \ 42 42 } 43 43 44 + /* Denverton */ 44 45 static const struct pinctrl_pin_desc dnv_pins[] = { 45 46 /* North ALL */ 46 47 PINCTRL_PIN(0, "GBE0_SDP0"), ··· 62 61 PINCTRL_PIN(15, "NCSI_CLK_IN"), 63 62 PINCTRL_PIN(16, "NCSI_RXD1"), 64 63 PINCTRL_PIN(17, "NCSI_CRS_DV"), 65 - PINCTRL_PIN(18, "NCSI_ARB_IN"), 64 + PINCTRL_PIN(18, "IDSLDO_VID_TICKLE"), 66 65 PINCTRL_PIN(19, "NCSI_TX_EN"), 67 66 PINCTRL_PIN(20, "NCSI_TXD0"), 68 67 PINCTRL_PIN(21, "NCSI_TXD1"), ··· 71 70 PINCTRL_PIN(24, "GBE0_LED1"), 72 71 PINCTRL_PIN(25, "GBE1_LED0"), 73 72 PINCTRL_PIN(26, "GBE1_LED1"), 74 - PINCTRL_PIN(27, "GPIO_0"), 73 + PINCTRL_PIN(27, "SPARE_0"), 75 74 PINCTRL_PIN(28, "PCIE_CLKREQ0_N"), 76 75 PINCTRL_PIN(29, "PCIE_CLKREQ1_N"), 77 76 PINCTRL_PIN(30, "PCIE_CLKREQ2_N"), 78 77 PINCTRL_PIN(31, "PCIE_CLKREQ3_N"), 79 78 PINCTRL_PIN(32, "PCIE_CLKREQ4_N"), 80 - PINCTRL_PIN(33, "GPIO_1"), 81 - PINCTRL_PIN(34, "GPIO_2"), 79 + PINCTRL_PIN(33, "GBE_MDC"), 80 + PINCTRL_PIN(34, "GBE_MDIO"), 82 81 PINCTRL_PIN(35, "SVID_ALERT_N"), 83 82 PINCTRL_PIN(36, "SVID_DATA"), 84 83 PINCTRL_PIN(37, "SVID_CLK"), ··· 105 104 PINCTRL_PIN(57, "DFX_PORT14"), 106 105 PINCTRL_PIN(58, "DFX_PORT15"), 107 106 /* South GPP0 */ 108 - PINCTRL_PIN(59, "GPIO_12"), 109 - PINCTRL_PIN(60, "SMB5_GBE_ALRT_N"), 107 + PINCTRL_PIN(59, "SPI_TPM_CS_N"), 108 + PINCTRL_PIN(60, "UART2_CTS"), 110 109 PINCTRL_PIN(61, "PCIE_CLKREQ5_N"), 111 110 PINCTRL_PIN(62, "PCIE_CLKREQ6_N"), 112 111 PINCTRL_PIN(63, "PCIE_CLKREQ7_N"), 113 112 PINCTRL_PIN(64, "UART0_RXD"), 114 113 PINCTRL_PIN(65, "UART0_TXD"), 115 - PINCTRL_PIN(66, "SMB5_GBE_CLK"), 116 - PINCTRL_PIN(67, "SMB5_GBE_DATA"), 114 + PINCTRL_PIN(66, "CPU_RESET_N"), 115 + PINCTRL_PIN(67, "NMI"), 117 116 PINCTRL_PIN(68, "ERROR2_N"), 118 117 PINCTRL_PIN(69, "ERROR1_N"), 119 118 PINCTRL_PIN(70, "ERROR0_N"), ··· 132 131 PINCTRL_PIN(83, "USB_OC0_N"), 133 132 PINCTRL_PIN(84, "FLEX_CLK_SE0"), 134 133 PINCTRL_PIN(85, "FLEX_CLK_SE1"), 135 - PINCTRL_PIN(86, "GPIO_4"), 136 - PINCTRL_PIN(87, "GPIO_5"), 137 - PINCTRL_PIN(88, "GPIO_6"), 138 - PINCTRL_PIN(89, "GPIO_7"), 134 + PINCTRL_PIN(86, "SPARE_4"), 135 + PINCTRL_PIN(87, "SMB3_IE0_CLK"), 136 + PINCTRL_PIN(88, "SMB3_IE0_DATA"), 137 + PINCTRL_PIN(89, "SMB3_IE0_ALRT_N"), 139 138 PINCTRL_PIN(90, "SATA0_LED_N"), 140 139 PINCTRL_PIN(91, "SATA1_LED_N"), 141 140 PINCTRL_PIN(92, "SATA_PDETECT0"), 142 141 PINCTRL_PIN(93, "SATA_PDETECT1"), 143 - PINCTRL_PIN(94, "SATA0_SDOUT"), 144 - PINCTRL_PIN(95, "SATA1_SDOUT"), 142 + PINCTRL_PIN(94, "UART1_RTS"), 143 + PINCTRL_PIN(95, "UART1_CTS"), 145 144 PINCTRL_PIN(96, "UART1_RXD"), 146 145 PINCTRL_PIN(97, "UART1_TXD"), 147 - PINCTRL_PIN(98, "GPIO_8"), 148 - PINCTRL_PIN(99, "GPIO_9"), 146 + PINCTRL_PIN(98, "SPARE_8"), 147 + PINCTRL_PIN(99, "SPARE_9"), 149 148 PINCTRL_PIN(100, "TCK"), 150 149 PINCTRL_PIN(101, "TRST_N"), 151 150 PINCTRL_PIN(102, "TMS"), ··· 153 152 PINCTRL_PIN(104, "TDO"), 154 153 PINCTRL_PIN(105, "CX_PRDY_N"), 155 154 PINCTRL_PIN(106, "CX_PREQ_N"), 156 - PINCTRL_PIN(107, "CTBTRIGINOUT"), 157 - PINCTRL_PIN(108, "CTBTRIGOUT"), 158 - PINCTRL_PIN(109, "DFX_SPARE2"), 159 - PINCTRL_PIN(110, "DFX_SPARE3"), 160 - PINCTRL_PIN(111, "DFX_SPARE4"), 155 + PINCTRL_PIN(107, "TAP1_TCK"), 156 + PINCTRL_PIN(108, "TAP1_TRST_N"), 157 + PINCTRL_PIN(109, "TAP1_TMS"), 158 + PINCTRL_PIN(110, "TAP1_TDI"), 159 + PINCTRL_PIN(111, "TAP1_TDO"), 161 160 /* South GPP1 */ 162 161 PINCTRL_PIN(112, "SUSPWRDNACK"), 163 162 PINCTRL_PIN(113, "PMU_SUSCLK"), ··· 186 185 PINCTRL_PIN(136, "ESPI_CLK"), 187 186 PINCTRL_PIN(137, "ESPI_RST_N"), 188 187 PINCTRL_PIN(138, "ESPI_ALRT0_N"), 189 - PINCTRL_PIN(139, "GPIO_10"), 190 - PINCTRL_PIN(140, "GPIO_11"), 188 + PINCTRL_PIN(139, "ESPI_CS1_N"), 189 + PINCTRL_PIN(140, "ESPI_ALRT1_N"), 191 190 PINCTRL_PIN(141, "ESPI_CLK_LOOPBK"), 192 191 PINCTRL_PIN(142, "EMMC_CMD"), 193 192 PINCTRL_PIN(143, "EMMC_STROBE"), ··· 200 199 PINCTRL_PIN(150, "EMMC_D5"), 201 200 PINCTRL_PIN(151, "EMMC_D6"), 202 201 PINCTRL_PIN(152, "EMMC_D7"), 203 - PINCTRL_PIN(153, "GPIO_3"), 202 + PINCTRL_PIN(153, "SPARE_3"), 204 203 }; 205 204 206 205 static const unsigned int dnv_uart0_pins[] = { 60, 61, 64, 65 };