mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-27 03:49:57 -04:00
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 ...
This commit is contained in:
Linus Torvalds
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <linux/errno.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/dmi.h>
|
||||
|
||||
/* WMI Methods */
|
||||
#define ASUS_WMI_METHODID_SPEC 0x43455053 /* BIOS SPECification */
|
||||
@@ -69,6 +70,7 @@
|
||||
#define ASUS_WMI_DEVID_SCREENPAD_LIGHT 0x00050032
|
||||
#define ASUS_WMI_DEVID_FAN_BOOST_MODE 0x00110018
|
||||
#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075
|
||||
#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO 0x00110019
|
||||
|
||||
/* Misc */
|
||||
#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,
|
||||
}
|
||||
#endif
|
||||
|
||||
/* To be used by both hid-asus and asus-wmi to determine which controls kbd_brightness */
|
||||
static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {
|
||||
{
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Zephyrus"),
|
||||
},
|
||||
},
|
||||
{
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Strix"),
|
||||
},
|
||||
},
|
||||
{
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"),
|
||||
},
|
||||
},
|
||||
{
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_BOARD_NAME, "GA403U"),
|
||||
},
|
||||
},
|
||||
{
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_BOARD_NAME, "GU605M"),
|
||||
},
|
||||
},
|
||||
{
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_BOARD_NAME, "RC71L"),
|
||||
},
|
||||
},
|
||||
{ },
|
||||
};
|
||||
|
||||
#endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */
|
||||
|
||||
19
include/linux/platform_data/x86/intel-mid_wdt.h
Normal file
19
include/linux/platform_data/x86/intel-mid_wdt.h
Normal file
@@ -0,0 +1,19 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* intel-mid_wdt: generic Intel MID SCU watchdog driver
|
||||
*
|
||||
* Copyright (C) 2014 Intel Corporation. All rights reserved.
|
||||
* Contact: David Cohen <david.a.cohen@linux.intel.com>
|
||||
*/
|
||||
|
||||
#ifndef __PLATFORM_X86_INTEL_MID_WDT_H_
|
||||
#define __PLATFORM_X86_INTEL_MID_WDT_H_
|
||||
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
struct intel_mid_wdt_pdata {
|
||||
int irq;
|
||||
int (*probe)(struct platform_device *pdev);
|
||||
};
|
||||
|
||||
#endif /* __PLATFORM_X86_INTEL_MID_WDT_H_ */
|
||||
68
include/linux/platform_data/x86/intel_scu_ipc.h
Normal file
68
include/linux/platform_data/x86/intel_scu_ipc.h
Normal file
@@ -0,0 +1,68 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __PLATFORM_X86_INTEL_SCU_IPC_H_
|
||||
#define __PLATFORM_X86_INTEL_SCU_IPC_H_
|
||||
|
||||
#include <linux/ioport.h>
|
||||
|
||||
struct device;
|
||||
struct intel_scu_ipc_dev;
|
||||
|
||||
/**
|
||||
* struct intel_scu_ipc_data - Data used to configure SCU IPC
|
||||
* @mem: Base address of SCU IPC MMIO registers
|
||||
* @irq: The IRQ number used for SCU (optional)
|
||||
*/
|
||||
struct intel_scu_ipc_data {
|
||||
struct resource mem;
|
||||
int irq;
|
||||
};
|
||||
|
||||
struct intel_scu_ipc_dev *
|
||||
__intel_scu_ipc_register(struct device *parent,
|
||||
const struct intel_scu_ipc_data *scu_data,
|
||||
struct module *owner);
|
||||
|
||||
#define intel_scu_ipc_register(parent, scu_data) \
|
||||
__intel_scu_ipc_register(parent, scu_data, THIS_MODULE)
|
||||
|
||||
void intel_scu_ipc_unregister(struct intel_scu_ipc_dev *scu);
|
||||
|
||||
struct intel_scu_ipc_dev *
|
||||
__devm_intel_scu_ipc_register(struct device *parent,
|
||||
const struct intel_scu_ipc_data *scu_data,
|
||||
struct module *owner);
|
||||
|
||||
#define devm_intel_scu_ipc_register(parent, scu_data) \
|
||||
__devm_intel_scu_ipc_register(parent, scu_data, THIS_MODULE)
|
||||
|
||||
struct intel_scu_ipc_dev *intel_scu_ipc_dev_get(void);
|
||||
void intel_scu_ipc_dev_put(struct intel_scu_ipc_dev *scu);
|
||||
struct intel_scu_ipc_dev *devm_intel_scu_ipc_dev_get(struct device *dev);
|
||||
|
||||
int intel_scu_ipc_dev_ioread8(struct intel_scu_ipc_dev *scu, u16 addr,
|
||||
u8 *data);
|
||||
int intel_scu_ipc_dev_iowrite8(struct intel_scu_ipc_dev *scu, u16 addr,
|
||||
u8 data);
|
||||
int intel_scu_ipc_dev_readv(struct intel_scu_ipc_dev *scu, u16 *addr,
|
||||
u8 *data, size_t len);
|
||||
int intel_scu_ipc_dev_writev(struct intel_scu_ipc_dev *scu, u16 *addr,
|
||||
u8 *data, size_t len);
|
||||
|
||||
int intel_scu_ipc_dev_update(struct intel_scu_ipc_dev *scu, u16 addr,
|
||||
u8 data, u8 mask);
|
||||
|
||||
int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd,
|
||||
int sub);
|
||||
int intel_scu_ipc_dev_command_with_size(struct intel_scu_ipc_dev *scu, int cmd,
|
||||
int sub, const void *in, size_t inlen,
|
||||
size_t size, void *out, size_t outlen);
|
||||
|
||||
static inline int intel_scu_ipc_dev_command(struct intel_scu_ipc_dev *scu, int cmd,
|
||||
int sub, const void *in, size_t inlen,
|
||||
void *out, size_t outlen)
|
||||
{
|
||||
return intel_scu_ipc_dev_command_with_size(scu, cmd, sub, in, inlen,
|
||||
inlen, out, outlen);
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user