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