.. | .. |
---|
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" |
---|
.. | .. |
---|
17 | 17 | #define LBG_PAD_OWN 0x020 |
---|
18 | 18 | #define LBG_PADCFGLOCK 0x060 |
---|
19 | 19 | #define LBG_HOSTSW_OWN 0x080 |
---|
| 20 | +#define LBG_GPI_IS 0x100 |
---|
20 | 21 | #define LBG_GPI_IE 0x110 |
---|
21 | 22 | |
---|
22 | 23 | #define LBG_COMMUNITY(b, s, e) \ |
---|
.. | .. |
---|
25 | 26 | .padown_offset = LBG_PAD_OWN, \ |
---|
26 | 27 | .padcfglock_offset = LBG_PADCFGLOCK, \ |
---|
27 | 28 | .hostown_offset = LBG_HOSTSW_OWN, \ |
---|
| 29 | + .is_offset = LBG_GPI_IS, \ |
---|
28 | 30 | .ie_offset = LBG_GPI_IE, \ |
---|
29 | 31 | .gpp_size = 24, \ |
---|
30 | 32 | .pin_base = (s), \ |
---|
.. | .. |
---|
309 | 311 | .ncommunities = ARRAY_SIZE(lbg_communities), |
---|
310 | 312 | }; |
---|
311 | 313 | |
---|
312 | | -static int lbg_pinctrl_probe(struct platform_device *pdev) |
---|
313 | | -{ |
---|
314 | | - return intel_pinctrl_probe(pdev, &lbg_soc_data); |
---|
315 | | -} |
---|
316 | | - |
---|
317 | | -static const struct dev_pm_ops lbg_pinctrl_pm_ops = { |
---|
318 | | - SET_LATE_SYSTEM_SLEEP_PM_OPS(intel_pinctrl_suspend, |
---|
319 | | - intel_pinctrl_resume) |
---|
320 | | -}; |
---|
| 314 | +static INTEL_PINCTRL_PM_OPS(lbg_pinctrl_pm_ops); |
---|
321 | 315 | |
---|
322 | 316 | static const struct acpi_device_id lbg_pinctrl_acpi_match[] = { |
---|
323 | | - { "INT3536" }, |
---|
| 317 | + { "INT3536", (kernel_ulong_t)&lbg_soc_data }, |
---|
324 | 318 | { } |
---|
325 | 319 | }; |
---|
326 | 320 | MODULE_DEVICE_TABLE(acpi, lbg_pinctrl_acpi_match); |
---|
327 | 321 | |
---|
328 | 322 | static struct platform_driver lbg_pinctrl_driver = { |
---|
329 | | - .probe = lbg_pinctrl_probe, |
---|
| 323 | + .probe = intel_pinctrl_probe_by_hid, |
---|
330 | 324 | .driver = { |
---|
331 | 325 | .name = "lewisburg-pinctrl", |
---|
332 | 326 | .acpi_match_table = lbg_pinctrl_acpi_match, |
---|