.. | .. |
---|
6 | 6 | * Author: Mika Westerberg <mika.westerberg@linux.intel.com> |
---|
7 | 7 | */ |
---|
8 | 8 | |
---|
9 | | -#include <linux/acpi.h> |
---|
| 9 | +#include <linux/mod_devicetable.h> |
---|
10 | 10 | #include <linux/module.h> |
---|
11 | 11 | #include <linux/platform_device.h> |
---|
12 | | -#include <linux/pm.h> |
---|
| 12 | + |
---|
13 | 13 | #include <linux/pinctrl/pinctrl.h> |
---|
14 | 14 | |
---|
15 | 15 | #include "pinctrl-intel.h" |
---|
.. | .. |
---|
91 | 91 | PINCTRL_PIN(43, "MEMTRIP_N"), |
---|
92 | 92 | PINCTRL_PIN(44, "UART0_RXD"), |
---|
93 | 93 | PINCTRL_PIN(45, "UART0_TXD"), |
---|
94 | | - PINCTRL_PIN(46, "UART1_RXD"), |
---|
95 | | - PINCTRL_PIN(47, "UART1_TXD"), |
---|
| 94 | + PINCTRL_PIN(46, "GBE_UART_RXD"), |
---|
| 95 | + PINCTRL_PIN(47, "GBE_UART_TXD"), |
---|
96 | 96 | /* WEST01 */ |
---|
97 | 97 | PINCTRL_PIN(48, "GBE_GPIO13"), |
---|
98 | 98 | PINCTRL_PIN(49, "AUX_PWR"), |
---|
99 | | - PINCTRL_PIN(50, "CPU_GP_2"), |
---|
100 | | - PINCTRL_PIN(51, "CPU_GP_3"), |
---|
| 99 | + PINCTRL_PIN(50, "UART0_RTS"), |
---|
| 100 | + PINCTRL_PIN(51, "UART0_CTS"), |
---|
101 | 101 | PINCTRL_PIN(52, "FAN_PWM_0"), |
---|
102 | 102 | PINCTRL_PIN(53, "FAN_PWM_1"), |
---|
103 | 103 | PINCTRL_PIN(54, "FAN_PWM_2"), |
---|
.. | .. |
---|
201 | 201 | /* WESTF */ |
---|
202 | 202 | PINCTRL_PIN(145, "NAC_RMII_CLK"), |
---|
203 | 203 | PINCTRL_PIN(146, "NAC_RGMII_CLK"), |
---|
204 | | - PINCTRL_PIN(147, "NAC_SPARE0"), |
---|
205 | | - PINCTRL_PIN(148, "NAC_SPARE1"), |
---|
| 204 | + PINCTRL_PIN(147, "NAC_GBE_SMB_CLK_TX_N2S"), |
---|
| 205 | + PINCTRL_PIN(148, "NAC_GBE_SMB_DATA_TX_N2S"), |
---|
206 | 206 | PINCTRL_PIN(149, "NAC_SPARE2"), |
---|
207 | 207 | PINCTRL_PIN(150, "NAC_INIT_SX_WAKE_N"), |
---|
208 | 208 | PINCTRL_PIN(151, "NAC_GBE_GPIO0_S2N"), |
---|
.. | .. |
---|
219 | 219 | PINCTRL_PIN(162, "NAC_NCSI_TXD1"), |
---|
220 | 220 | PINCTRL_PIN(163, "NAC_NCSI_ARB_OUT"), |
---|
221 | 221 | PINCTRL_PIN(164, "NAC_NCSI_OE_N"), |
---|
222 | | - PINCTRL_PIN(165, "NAC_GBE_SMB_CLK"), |
---|
223 | | - PINCTRL_PIN(166, "NAC_GBE_SMB_DATA"), |
---|
| 222 | + PINCTRL_PIN(165, "NAC_GBE_SMB_CLK_RX_S2N"), |
---|
| 223 | + PINCTRL_PIN(166, "NAC_GBE_SMB_DATA_RX_S2N"), |
---|
224 | 224 | PINCTRL_PIN(167, "NAC_GBE_SMB_ALRT_N"), |
---|
225 | 225 | /* EAST2 */ |
---|
226 | 226 | PINCTRL_PIN(168, "USB_OC0_N"), |
---|
.. | .. |
---|
232 | 232 | PINCTRL_PIN(174, "GBE_GPIO5"), |
---|
233 | 233 | PINCTRL_PIN(175, "GBE_GPIO6"), |
---|
234 | 234 | PINCTRL_PIN(176, "GBE_GPIO7"), |
---|
235 | | - PINCTRL_PIN(177, "GBE_GPIO8"), |
---|
| 235 | + PINCTRL_PIN(177, "SPI_TPM_CS_N"), |
---|
236 | 236 | PINCTRL_PIN(178, "GBE_GPIO9"), |
---|
237 | 237 | PINCTRL_PIN(179, "GBE_GPIO10"), |
---|
238 | 238 | PINCTRL_PIN(180, "GBE_GPIO11"), |
---|
.. | .. |
---|
330 | 330 | .ncommunities = ARRAY_SIZE(cdf_communities), |
---|
331 | 331 | }; |
---|
332 | 332 | |
---|
333 | | -static int cdf_pinctrl_probe(struct platform_device *pdev) |
---|
334 | | -{ |
---|
335 | | - return intel_pinctrl_probe(pdev, &cdf_soc_data); |
---|
336 | | -} |
---|
337 | | - |
---|
338 | | -static const struct dev_pm_ops cdf_pinctrl_pm_ops = { |
---|
339 | | - SET_LATE_SYSTEM_SLEEP_PM_OPS(intel_pinctrl_suspend, |
---|
340 | | - intel_pinctrl_resume) |
---|
341 | | -}; |
---|
| 333 | +static INTEL_PINCTRL_PM_OPS(cdf_pinctrl_pm_ops); |
---|
342 | 334 | |
---|
343 | 335 | static const struct acpi_device_id cdf_pinctrl_acpi_match[] = { |
---|
344 | | - { "INTC3001" }, |
---|
| 336 | + { "INTC3001", (kernel_ulong_t)&cdf_soc_data }, |
---|
345 | 337 | { } |
---|
346 | 338 | }; |
---|
347 | 339 | MODULE_DEVICE_TABLE(acpi, cdf_pinctrl_acpi_match); |
---|
348 | 340 | |
---|
349 | 341 | static struct platform_driver cdf_pinctrl_driver = { |
---|
350 | | - .probe = cdf_pinctrl_probe, |
---|
| 342 | + .probe = intel_pinctrl_probe_by_hid, |
---|
351 | 343 | .driver = { |
---|
352 | 344 | .name = "cedarfork-pinctrl", |
---|
353 | 345 | .acpi_match_table = cdf_pinctrl_acpi_match, |
---|