History

Merge tag 'platform-drivers-x86-v6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform drivers updates from Hans de Goede: - asus-wmi: Add support for vivobook fan profiles - dell-laptop: Add knobs to change battery charge settings - lg-laptop: Add operation region support - intel-uncore-freq: Add support for efficiency latency control - intel/ifs: Add SBAF test support - intel/pmc: Ignore all LTRs during suspend - platform/surface: Support for arm64 based Surface devices - wmi: Pass event data directly to legacy notify handlers - x86/platform/geode: switch GPIO buttons and LEDs to software properties - bunch of small cleanups, fixes, hw-id additions, etc. * tag 'platform-drivers-x86-v6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (65 commits) MAINTAINERS: adjust file entry in INTEL MID PLATFORM platform/x86: x86-android-tablets: Adjust Xiaomi Pad 2 bottom bezel touch buttons LED platform/mellanox: mlxbf-pmc: fix lockdep warning platform/x86/amd: pmf: Add quirk for TUF Gaming A14 platform/x86: touchscreen_dmi: add nanote-next quirk platform/x86: asus-wmi: don't fail if platform_profile already registered platform/x86: asus-wmi: add debug print in more key places platform/x86: intel_scu_wdt: Move intel_scu_wdt.h to x86 subfolder platform/x86: intel_scu_ipc: Move intel_scu_ipc.h out of arch/x86/include/asm MAINTAINERS: Add Intel MID section platform/x86: panasonic-laptop: Add support for programmable buttons platform/olpc: Remove redundant null pointer checks in olpc_ec_setup_debugfs() platform/x86: intel/pmc: Ignore all LTRs during suspend platform/x86: wmi: Call both legacy and WMI driver notify handlers platform/x86: wmi: Merge get_event_data() with wmi_get_notify_data() platform/x86: wmi: Remove wmi_get_event_data() platform/x86: wmi: Pass event data directly to legacy notify handlers platform/x86: thinkpad_acpi: Fix uninitialized symbol 's' warning platform/x86: x86-android-tablets: Fix spelling in the comments platform/x86: ideapad-laptop: Make the scope_guard() clear of its scope ...

Linus Torvalds committed 2 years ago

Commit 84bbfe62 parents 2a17bb8 837acb6101 files · +2723 −1060Browse files

Showing the changes to include/linux/platform_data (3 of 101 files). Show all

Unified · Split

3 files
  1. include/linux/platform_data/x86/asus-wmi.h +37 −0
  2. include/linux/platform_data/x86/intel-mid_wdt.h +3 −3
  3. include/linux/platform_data/x86/intel_scu_ipc.h +68 −0
include/linux/platform_data/x86/asus-wmi.h+37−0
@@ -4,6 +4,7 @@ · 3 unmodified lines
4 4
5#include <linux/errno.h>5#include <linux/errno.h>
6#include <linux/types.h>6#include <linux/types.h>
7#include <linux/dmi.h>
7 8
8/* WMI Methods */9/* WMI Methods */
9#define ASUS_WMI_METHODID_SPEC 0x43455053 /* BIOS SPECification */10#define ASUS_WMI_METHODID_SPEC 0x43455053 /* BIOS SPECification */
@@ -69,6 +70,7 @@ · 59 unmodified lines
69#define ASUS_WMI_DEVID_SCREENPAD_LIGHT 0x0005003270#define ASUS_WMI_DEVID_SCREENPAD_LIGHT 0x00050032
70#define ASUS_WMI_DEVID_FAN_BOOST_MODE 0x0011001871#define ASUS_WMI_DEVID_FAN_BOOST_MODE 0x00110018
71#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x0012007572#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075
73#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO 0x00110019
72 74
73/* Misc */75/* Misc */
74#define ASUS_WMI_DEVID_PANEL_OD 0x0005001976#define ASUS_WMI_DEVID_PANEL_OD 0x00050019
@@ -165,4 +167,39 @@ static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, · 90 unmodified lines
165}167}
166#endif168#endif
167 169
170/* To be used by both hid-asus and asus-wmi to determine which controls kbd_brightness */
171static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {
172 {
173 .matches = {
174 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Zephyrus"),
175 },
176 },
177 {
178 .matches = {
179 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Strix"),
180 },
181 },
182 {
183 .matches = {
184 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"),
185 },
186 },
187 {
188 .matches = {
189 DMI_MATCH(DMI_BOARD_NAME, "GA403U"),
190 },
191 },
192 {
193 .matches = {
194 DMI_MATCH(DMI_BOARD_NAME, "GU605M"),
195 },
196 },
197 {
198 .matches = {
199 DMI_MATCH(DMI_BOARD_NAME, "RC71L"),
200 },
201 },
202 { },
203};
204
168#endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */205#endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */
include/linux/platform_data/x86/intel-mid_wdt.hrenamed from include/linux/platform_data/intel-mid_wdt.h+3−3
@@ -6,8 +6,8 @@ · 5 unmodified lines
6 * Contact: David Cohen <david.a.cohen@linux.intel.com>6 * Contact: David Cohen <david.a.cohen@linux.intel.com>
7 */7 */
8 8
9#ifndef __INTEL_MID_WDT_H__9#ifndef __PLATFORM_X86_INTEL_MID_WDT_H_
10#define __INTEL_MID_WDT_H__10#define __PLATFORM_X86_INTEL_MID_WDT_H_
11 11
12#include <linux/platform_device.h>12#include <linux/platform_device.h>
13 13
@@ -16,4 +16,4 @@ struct intel_mid_wdt_pdata { · 2 unmodified lines
16 int (*probe)(struct platform_device *pdev);16 int (*probe)(struct platform_device *pdev);
17};17};
18 18
19#endif /*__INTEL_MID_WDT_H__*/19#endif /* __PLATFORM_X86_INTEL_MID_WDT_H_ */
include/linux/platform_data/x86/intel_scu_ipc.h+68−0
@@ -0,0 +1,68 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2#ifndef __PLATFORM_X86_INTEL_SCU_IPC_H_
3#define __PLATFORM_X86_INTEL_SCU_IPC_H_
4
5#include <linux/ioport.h>
6
7struct device;
8struct intel_scu_ipc_dev;
9
10/**
11 * struct intel_scu_ipc_data - Data used to configure SCU IPC
12 * @mem: Base address of SCU IPC MMIO registers
13 * @irq: The IRQ number used for SCU (optional)
14 */
15struct intel_scu_ipc_data {
16 struct resource mem;
17 int irq;
18};
19
20struct intel_scu_ipc_dev *
21__intel_scu_ipc_register(struct device *parent,
22 const struct intel_scu_ipc_data *scu_data,
23 struct module *owner);
24
25#define intel_scu_ipc_register(parent, scu_data) \
26 __intel_scu_ipc_register(parent, scu_data, THIS_MODULE)
27
28void intel_scu_ipc_unregister(struct intel_scu_ipc_dev *scu);
29
30struct intel_scu_ipc_dev *
31__devm_intel_scu_ipc_register(struct device *parent,
32 const struct intel_scu_ipc_data *scu_data,
33 struct module *owner);
34
35#define devm_intel_scu_ipc_register(parent, scu_data) \
36 __devm_intel_scu_ipc_register(parent, scu_data, THIS_MODULE)
37
38struct intel_scu_ipc_dev *intel_scu_ipc_dev_get(void);
39void intel_scu_ipc_dev_put(struct intel_scu_ipc_dev *scu);
40struct intel_scu_ipc_dev *devm_intel_scu_ipc_dev_get(struct device *dev);
41
42int intel_scu_ipc_dev_ioread8(struct intel_scu_ipc_dev *scu, u16 addr,
43 u8 *data);
44int intel_scu_ipc_dev_iowrite8(struct intel_scu_ipc_dev *scu, u16 addr,
45 u8 data);
46int intel_scu_ipc_dev_readv(struct intel_scu_ipc_dev *scu, u16 *addr,
47 u8 *data, size_t len);
48int intel_scu_ipc_dev_writev(struct intel_scu_ipc_dev *scu, u16 *addr,
49 u8 *data, size_t len);
50
51int intel_scu_ipc_dev_update(struct intel_scu_ipc_dev *scu, u16 addr,
52 u8 data, u8 mask);
53
54int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd,
55 int sub);
56int intel_scu_ipc_dev_command_with_size(struct intel_scu_ipc_dev *scu, int cmd,
57 int sub, const void *in, size_t inlen,
58 size_t size, void *out, size_t outlen);
59
60static inline int intel_scu_ipc_dev_command(struct intel_scu_ipc_dev *scu, int cmd,
61 int sub, const void *in, size_t inlen,
62 void *out, size_t outlen)
63{
64 return intel_scu_ipc_dev_command_with_size(scu, cmd, sub, in, inlen,
65 inlen, out, outlen);
66}
67
68#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t