diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 19:20:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 19:20:36 -0400 |
| commit | f6811370b9266a3d8a21e27cb5f46751f97df2fb (patch) | |
| tree | 10b546ed7e900ee4178777007180f87e02f40bcd /include/linux/platform_data | |
| parent | ca4e7c51201fc47b2668d58faaa3b46a99d1a233 (diff) | |
| parent | c171d3b8a67e08884d915ffbb1dbc475747d7df2 (diff) | |
Merge tag 'chrome-platform-for-linus-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform
Pull chrome platform updates from Benson Leung:
- a series from Dmitry to remove platform data from chromeos_laptop.c,
which was the only user of platform data for the atmel_mxt_ts driver.
- a series to clean up sysfs and debugfs for cros_ec
- other misc cleanups
* tag 'chrome-platform-for-linus-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform: (22 commits)
platform/chrome: mfd/cros_ec_dev: Add sysfs entry to set keyboard wake lid angle
platform/chrome: cros_ec_debugfs: Add PD port info to debugfs
platform/chrome: cros_ec_debugfs: Use octal permissions '0444'
platform/chrome: cros_ec_sysfs: use permission-specific DEVICE_ATTR variants
platform/chrome: cros_ec_sysfs: introduce to_cros_ec_dev define.
platform/chrome: cros_ec_sysfs: Modify error handling
platform/chrome: cros_ec_lpc: Add support for Google devices using custom coreboot firmware
platform/chrome: cros_ec_lpc: wake up from s2idle on Chrome EC
Input: atmel_mxt_ts - remove platform data support
platform/chrome: chromeos_laptop - discard data for unneeded boards
platform/chrome: chromeos_laptop - use device properties for Pixel
platform/chrome: chromeos_laptop - rely on I2C to set up interrupt trigger
platform/chrome: chromeos_laptop - use I2C notifier to create devices
platform/chrome: chromeos_laptop - parse DMI IRQ data once
platform/chrome: chromeos_laptop - rework i2c peripherals initialization
platform/chrome: chromeos_laptop - factor out getting IRQ from DMI
platform/chrome: chromeos_laptop - introduce pr_fmt()
platform/chrome: chromeos_laptop - stop setting suspend mode for Atmel devices
platform/chrome: chromeos_laptop - add SPDX identifier
Input: atmel_mxt_ts - switch ChromeOS ACPI devices to generic props
...
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/atmel_mxt_ts.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/include/linux/platform_data/atmel_mxt_ts.h b/include/linux/platform_data/atmel_mxt_ts.h deleted file mode 100644 index 695035a8d7fb..000000000000 --- a/include/linux/platform_data/atmel_mxt_ts.h +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Atmel maXTouch Touchscreen driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2010 Samsung Electronics Co.Ltd | ||
| 5 | * Author: Joonyoung Shim <jy0922.shim@samsung.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify it | ||
| 8 | * under the terms of the GNU General Public License as published by the | ||
| 9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 10 | * option) any later version. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H | ||
| 14 | #define __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H | ||
| 15 | |||
| 16 | #include <linux/types.h> | ||
| 17 | |||
| 18 | enum mxt_suspend_mode { | ||
| 19 | MXT_SUSPEND_DEEP_SLEEP = 0, | ||
| 20 | MXT_SUSPEND_T9_CTRL = 1, | ||
| 21 | }; | ||
| 22 | |||
| 23 | /* The platform data for the Atmel maXTouch touchscreen driver */ | ||
| 24 | struct mxt_platform_data { | ||
| 25 | unsigned long irqflags; | ||
| 26 | u8 t19_num_keys; | ||
| 27 | const unsigned int *t19_keymap; | ||
| 28 | enum mxt_suspend_mode suspend_mode; | ||
| 29 | }; | ||
| 30 | |||
| 31 | #endif /* __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H */ | ||
