History

Merge branch 'for-6.20/sony' into for-linus

- Support for Rock band 4 PS4 and PS5 guitars (Rosalie Wanders)

Jiri Kosina committed 9 months ago

Commit ec496f72 parents 984d6f3 ae40ace5835 files · +248662 −76837Browse files

Showing the changes to include/linux/platform_data (4 of 5835 files). Show all

Unified · Split

4 files
  1. include/linux/platform_data/usb-davinci.h +0 −22
  2. include/linux/platform_data/x86/asus-wmi-leds-ids.h +50 −0
  3. include/linux/platform_data/x86/asus-wmi.h +16 −42
  4. include/linux/platform_data/x86/intel_pmc_ipc.h +2 −2
include/linux/platform_data/usb-davinci.h+0−22
@@ -1,22 +0,0 @@
1/*
2 * USB related definitions
3 *
4 * Copyright (C) 2009 MontaVista Software, Inc. <source@mvista.com>
5 *
6 * This file is licensed under the terms of the GNU General Public License
7 * version 2. This program is licensed "as is" without any warranty of any
8 * kind, whether express or implied.
9 */
10
11#ifndef __ASM_ARCH_USB_H
12#define __ASM_ARCH_USB_H
13
14/* Passed as the platform data to the OHCI driver */
15struct da8xx_ohci_root_hub {
16 /* Time from power on to power good (in 2 ms units) */
17 u8 potpgt;
18};
19
20void davinci_setup_usb(unsigned mA, unsigned potpgt_ms);
21
22#endif /* ifndef __ASM_ARCH_USB_H */
include/linux/platform_data/x86/asus-wmi-leds-ids.h+50−0
@@ -0,0 +1,50 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2#ifndef __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H
3#define __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H
4
5#include <linux/dmi.h>
6#include <linux/types.h>
7
8/* To be used by both hid-asus and asus-wmi to determine which controls kbd_brightness */
9#if IS_REACHABLE(CONFIG_ASUS_WMI) || IS_REACHABLE(CONFIG_HID_ASUS)
10static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {
11 {
12 .matches = {
13 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Zephyrus"),
14 },
15 },
16 {
17 .matches = {
18 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Strix"),
19 },
20 },
21 {
22 .matches = {
23 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"),
24 },
25 },
26 {
27 .matches = {
28 DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt P16"),
29 },
30 },
31 {
32 .matches = {
33 DMI_MATCH(DMI_BOARD_NAME, "GA403U"),
34 },
35 },
36 {
37 .matches = {
38 DMI_MATCH(DMI_BOARD_NAME, "GU605M"),
39 },
40 },
41 {
42 .matches = {
43 DMI_MATCH(DMI_BOARD_NAME, "RC71L"),
44 },
45 },
46 { },
47};
48#endif
49
50#endif /* __PLATFORM_DATA_X86_ASUS_WMI_LEDS_IDS_H */
include/linux/platform_data/x86/asus-wmi.h+16−42
@@ -4,7 +4,9 @@ · 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#define ASUS_WMI_MGMT_GUID "97845ED0-4E6D-11DE-8A39-0800200C9A66"
9#define ASUS_ACPI_UID_ASUSWMI "ASUSWMI"
8 10
9/* WMI Methods */11/* WMI Methods */
10#define ASUS_WMI_METHODID_SPEC 0x43455053 /* BIOS SPECification */12#define ASUS_WMI_METHODID_SPEC 0x43455053 /* BIOS SPECification */
@@ -74,12 +76,14 @@ · 63 unmodified lines
74#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO 0x0011001976#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY_VIVO 0x00110019
75 77
76/* Misc */78/* Misc */
79#define ASUS_WMI_DEVID_PANEL_HD 0x0005001C
77#define ASUS_WMI_DEVID_PANEL_OD 0x0005001980#define ASUS_WMI_DEVID_PANEL_OD 0x00050019
78#define ASUS_WMI_DEVID_CAMERA 0x0006001381#define ASUS_WMI_DEVID_CAMERA 0x00060013
79#define ASUS_WMI_DEVID_LID_FLIP 0x0006006282#define ASUS_WMI_DEVID_LID_FLIP 0x00060062
80#define ASUS_WMI_DEVID_LID_FLIP_ROG 0x0006007783#define ASUS_WMI_DEVID_LID_FLIP_ROG 0x00060077
81#define ASUS_WMI_DEVID_MINI_LED_MODE 0x0005001E84#define ASUS_WMI_DEVID_MINI_LED_MODE 0x0005001E
82#define ASUS_WMI_DEVID_MINI_LED_MODE2 0x0005002E85#define ASUS_WMI_DEVID_MINI_LED_MODE2 0x0005002E
86#define ASUS_WMI_DEVID_SCREEN_AUTO_BRIGHTNESS 0x0005002A
83 87
84/* Storage */88/* Storage */
85#define ASUS_WMI_DEVID_CARDREADER 0x0008001389#define ASUS_WMI_DEVID_CARDREADER 0x00080013
@@ -104,7 +108,7 @@ · 18 unmodified lines
104#define ASUS_WMI_DEVID_PPT_PL1_SPL 0x001200A3108#define ASUS_WMI_DEVID_PPT_PL1_SPL 0x001200A3
105#define ASUS_WMI_DEVID_PPT_APU_SPPT 0x001200B0109#define ASUS_WMI_DEVID_PPT_APU_SPPT 0x001200B0
106#define ASUS_WMI_DEVID_PPT_PLAT_SPPT 0x001200B1110#define ASUS_WMI_DEVID_PPT_PLAT_SPPT 0x001200B1
107#define ASUS_WMI_DEVID_PPT_FPPT 0x001200C1111#define ASUS_WMI_DEVID_PPT_PL3_FPPT 0x001200C1
108#define ASUS_WMI_DEVID_NV_DYN_BOOST 0x001200C0112#define ASUS_WMI_DEVID_NV_DYN_BOOST 0x001200C0
109#define ASUS_WMI_DEVID_NV_THERM_TARGET 0x001200C2113#define ASUS_WMI_DEVID_NV_THERM_TARGET 0x001200C2
110 114
@@ -134,6 +138,11 @@ · 23 unmodified lines
134/* dgpu on/off */138/* dgpu on/off */
135#define ASUS_WMI_DEVID_DGPU 0x00090020139#define ASUS_WMI_DEVID_DGPU 0x00090020
136 140
141#define ASUS_WMI_DEVID_APU_MEM 0x000600C1
142
143#define ASUS_WMI_DEVID_DGPU_BASE_TGP 0x00120099
144#define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098
145
137/* gpu mux switch, 0 = dGPU, 1 = Optimus */146/* gpu mux switch, 0 = dGPU, 1 = Optimus */
138#define ASUS_WMI_DEVID_GPU_MUX 0x00090016147#define ASUS_WMI_DEVID_GPU_MUX 0x00090016
139#define ASUS_WMI_DEVID_GPU_MUX_VIVO 0x00090026148#define ASUS_WMI_DEVID_GPU_MUX_VIVO 0x00090026
@@ -167,6 +176,7 @@ enum asus_ally_mcu_hack { · 27 unmodified lines
167#if IS_REACHABLE(CONFIG_ASUS_WMI)176#if IS_REACHABLE(CONFIG_ASUS_WMI)
168void set_ally_mcu_hack(enum asus_ally_mcu_hack status);177void set_ally_mcu_hack(enum asus_ally_mcu_hack status);
169void set_ally_mcu_powersave(bool enabled);178void set_ally_mcu_powersave(bool enabled);
179int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval);
170int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval);180int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval);
171int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retval);181int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retval);
172#else182#else
@@ -180,6 +190,10 @@ static inline int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval) · 7 unmodified lines
180{190{
181 return -ENODEV;191 return -ENODEV;
182}192}
193static inline int asus_wmi_get_devstate_dsts(u32 dev_id, u32 *retval)
194{
195 return -ENODEV;
196}
183static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1,197static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1,
184 u32 *retval)198 u32 *retval)
185{199{
@@ -187,44 +201,4 @@ static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, · 1 unmodified line
187}201}
188#endif202#endif
189 203
190/* To be used by both hid-asus and asus-wmi to determine which controls kbd_brightness */
191static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = {
192 {
193 .matches = {
194 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Zephyrus"),
195 },
196 },
197 {
198 .matches = {
199 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Strix"),
200 },
201 },
202 {
203 .matches = {
204 DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"),
205 },
206 },
207 {
208 .matches = {
209 DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt P16"),
210 },
211 },
212 {
213 .matches = {
214 DMI_MATCH(DMI_BOARD_NAME, "GA403U"),
215 },
216 },
217 {
218 .matches = {
219 DMI_MATCH(DMI_BOARD_NAME, "GU605M"),
220 },
221 },
222 {
223 .matches = {
224 DMI_MATCH(DMI_BOARD_NAME, "RC71L"),
225 },
226 },
227 { },
228};
229
230#endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */204#endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */
include/linux/platform_data/x86/intel_pmc_ipc.h+2−2
@@ -9,6 +9,7 @@ · 8 unmodified lines
9#ifndef INTEL_PMC_IPC_H9#ifndef INTEL_PMC_IPC_H
10#define INTEL_PMC_IPC_H10#define INTEL_PMC_IPC_H
11#include <linux/acpi.h>11#include <linux/acpi.h>
12#include <linux/cleanup.h>
12 13
13#define IPC_SOC_REGISTER_ACCESS 0xAA14#define IPC_SOC_REGISTER_ACCESS 0xAA
14#define IPC_SOC_SUB_CMD_READ 0x0015#define IPC_SOC_SUB_CMD_READ 0x00
@@ -48,7 +49,6 @@ static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf · 33 unmodified lines
48 {.type = ACPI_TYPE_INTEGER,},49 {.type = ACPI_TYPE_INTEGER,},
49 };50 };
50 struct acpi_object_list arg_list = { PMC_IPCS_PARAM_COUNT, params };51 struct acpi_object_list arg_list = { PMC_IPCS_PARAM_COUNT, params };
51 union acpi_object *obj;
52 int status;52 int status;
53 53
54 if (!ipc_cmd || !rbuf)54 if (!ipc_cmd || !rbuf)
@@ -72,7 +72,7 @@ static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf · 17 unmodified lines
72 if (ACPI_FAILURE(status))72 if (ACPI_FAILURE(status))
73 return -ENODEV;73 return -ENODEV;
74 74
75 obj = buffer.pointer;75 union acpi_object *obj __free(kfree) = buffer.pointer;
76 76
77 if (obj && obj->type == ACPI_TYPE_PACKAGE &&77 if (obj && obj->type == ACPI_TYPE_PACKAGE &&
78 obj->package.count == VALID_IPC_RESPONSE) {78 obj->package.count == VALID_IPC_RESPONSE) {

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