Unverified Commit 88e326b3 authored by Ilpo Järvinen's avatar Ilpo Järvinen
Browse files

Merge branch 'fixes' into for-next 

Merge fixes back into for-next to be able to take dell_rbu change that
is build on top of fixes material, and to bring lenovo related changes
in sync after the move under lenovo/ subdir in the for-next branch and
diverging changes in the fixes branch.
parents be91bf40 4f30f946

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br> 
Gustavo Padovan <padovan@profusion.mobi>

Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>

Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>

Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>

Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>

Documentation/wmi/acpi-interface.rst

+9 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Offset Size (in bytes) Content 


The WMI object flags control whether the method or notification ID is used:



- 0x1: Data block usage is expensive and must be explicitly enabled/disabled.

- 0x1: Data block is expensive to collect.

- 0x2: Data block contains WMI methods.

- 0x4: Data block contains ASCIZ string.

- 0x8: Data block describes a WMI event, use notification ID instead
@@ -83,14 +83,18 @@ event as hexadecimal value. Their first parameter is an integer with a value 
of 0 if the WMI event should be disabled, other values will enable

the WMI event.



Those ACPI methods are always called even for WMI events not registered as

being expensive to collect to match the behavior of the Windows driver.



WCxx ACPI methods

-----------------

Similar to the ``WExx`` ACPI methods, except that it controls data collection

instead of events and thus the last two characters of the ACPI method name are

the method ID of the data block to enable/disable.

Similar to the ``WExx`` ACPI methods, except that instead of WMI events it controls

data collection of data blocks registered as being expensive to collect. Thus the

last two characters of the ACPI method name are the method ID of the data block

to enable/disable.



Those ACPI methods are also called before setting data blocks to match the

behaviour of the Windows driver.

behavior of the Windows driver.



_WED ACPI method

----------------

MAINTAINERS

+36 −36
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ X: arch/*/include/uapi/ 
X:	include/uapi/









ABIT UGURU 1,2 HARDWARE MONITOR DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-hwmon@vger.kernel.org









S:	Maintained









F:	drivers/hwmon/abituguru.c








@@ -371,7 +371,7 @@ S:	Maintained







F:	drivers/platform/x86/quickstart.c

















ACPI SERIAL MULTI INSTANTIATE DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









F:	drivers/platform/x86/serial-multi-instantiate.c








@@ -3551,7 +3551,7 @@ F:	arch/arm64/boot/Makefile







F:	scripts/make_fit.py

















ARM64 PLATFORM DRIVERS









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









M:	Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>









R:	Bryan O'Donoghue <bryan.odonoghue@linaro.org>









L:	platform-driver-x86@vger.kernel.org








@@ -3712,7 +3712,7 @@ F:	drivers/platform/x86/asus*.c







F:	drivers/platform/x86/eeepc*.c

















ASUS TF103C DOCK DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git








@@ -5613,14 +5613,14 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git







F:	drivers/usb/chipidea/

















CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/input/touchscreen/chipone,icn8318.yaml









F:	drivers/input/touchscreen/chipone_icn8318.c

















CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









F:	drivers/input/touchscreen/chipone_icn8505.c








@@ -6917,7 +6917,7 @@ F:	include/dt-bindings/pmu/exynos_ppmu.h







F:	include/linux/devfreq-event.h

















DEVICE RESOURCE MANAGEMENT HELPERS









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









R:	Matti Vaittinen <mazziesaccount@gmail.com>









S:	Maintained









F:	include/linux/devm-helpers.h








@@ -7516,7 +7516,7 @@ F:	drivers/gpu/drm/gud/







F:	include/drm/gud.h

















DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









S:	Maintained









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git









F:	drivers/gpu/drm/tiny/gm12u320.c








@@ -7916,7 +7916,7 @@ F:	drivers/gpu/drm/ci/xfails/vkms*







F:	drivers/gpu/drm/vkms/

















DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git








@@ -8317,7 +8317,7 @@ F:	drivers/gpu/drm/panel/







F:	include/drm/drm_panel.h

















DRM PRIVACY-SCREEN CLASS









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git








@@ -10221,7 +10221,7 @@ S:	Maintained







F:	Documentation/devicetree/bindings/connector/gocontroll,moduline-module-slot.yaml

















GOODIX TOUCHSCREEN









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









F:	drivers/input/touchscreen/goodix*








@@ -10260,7 +10260,7 @@ F:	include/dt-bindings/clock/google,gs101.h







K:	[gG]oogle.?[tT]ensor

















GPD POCKET FAN DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









F:	drivers/platform/x86/gpd-pocket-fan.c








@@ -11421,7 +11421,7 @@ F:	drivers/i2c/busses/i2c-via.c







F:	drivers/i2c/busses/i2c-viapro.c

















I2C/SMBUS INTEL CHT WHISKEY COVE PMIC DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-i2c@vger.kernel.org









S:	Maintained









F:	drivers/i2c/busses/i2c-cht-wc.c








@@ -12011,13 +12011,13 @@ S:	Supported







F:	sound/soc/intel/

















INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









F:	drivers/platform/x86/intel/atomisp2/pm.c

















INTEL ATOMISP2 LED DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









F:	drivers/platform/x86/intel/atomisp2/led.c








@@ -13684,7 +13684,7 @@ S:	Maintained







F:	drivers/platform/x86/lenovo/wmi-hotkey-utilities.c

















LETSKETCH HID TABLET DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git








@@ -13734,7 +13734,7 @@ F:	drivers/ata/sata_gemini.c







F:	drivers/ata/sata_gemini.h

















LIBATA SATA AHCI PLATFORM devices support









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-ide@vger.kernel.org









S:	Maintained









F:	drivers/ata/ahci_platform.c








@@ -14104,7 +14104,7 @@ F:	Documentation/admin-guide/ldm.rst







F:	block/partitions/ldm.*

















LOGITECH HID GAMING KEYBOARDS









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git








@@ -14786,7 +14786,7 @@ F:	Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml







F:	drivers/power/supply/max17040_battery.c

















MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS









R:	Hans de Goede <hdegoede@redhat.com>









R:	Hans de Goede <hansg@kernel.org>









R:	Krzysztof Kozlowski <krzk@kernel.org>









R:	Marek Szyprowski <m.szyprowski@samsung.com>









R:	Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>








@@ -15588,7 +15588,7 @@ Q:	https://patchwork.kernel.org/project/netdevbpf/list/







F:	drivers/net/ethernet/mellanox/mlxfw/

















MELLANOX HARDWARE PLATFORM SUPPORT









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









M:	Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>









M:	Vadim Pasternak <vadimp@nvidia.com>









L:	platform-driver-x86@vger.kernel.org








@@ -16544,7 +16544,7 @@ S:	Maintained







F:	drivers/platform/surface/surface_gpe.c

















MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









M:	Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>









M:	Maximilian Luz <luzmaximilian@gmail.com>









L:	platform-driver-x86@vger.kernel.org








@@ -17712,7 +17712,7 @@ F:	tools/include/nolibc/







F:	tools/testing/selftests/nolibc/

















NOVATEK NVT-TS I2C TOUCHSCREEN DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/input/touchscreen/novatek,nvt-ts.yaml








@@ -22714,7 +22714,7 @@ K:	fu[57]40







K:	[^@]sifive

















SILEAD TOUCHSCREEN DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









L:	platform-driver-x86@vger.kernel.org









S:	Maintained








@@ -22747,7 +22747,7 @@ F:	Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml







F:	drivers/i3c/master/svc-i3c-master.c

















SIMPLEFB FB DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-fbdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/display/simple-framebuffer.yaml








@@ -22876,7 +22876,7 @@ F:	Documentation/hwmon/emc2103.rst







F:	drivers/hwmon/emc2103.c

















SMSC SCH5627 HARDWARE MONITOR DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-hwmon@vger.kernel.org









S:	Supported









F:	Documentation/hwmon/sch5627.rst








@@ -23531,7 +23531,7 @@ S:	Supported







F:	Documentation/process/stable-kernel-rules.rst

















STAGING - ATOMISP DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









M:	Mauro Carvalho Chehab <mchehab@kernel.org>









R:	Sakari Ailus <sakari.ailus@linux.intel.com>









L:	linux-media@vger.kernel.org








@@ -23828,7 +23828,7 @@ F:	arch/m68k/sun3*/







F:	drivers/net/ethernet/i825xx/sun3*

















SUN4I LOW RES ADC ATTACHED TABLET KEYS DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml








@@ -25596,7 +25596,7 @@ F:	Documentation/hid/hiddev.rst







F:	drivers/hid/usbhid/

















USB INTEL XHCI ROLE MUX DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-usb@vger.kernel.org









S:	Maintained









F:	drivers/usb/roles/intel-xhci-usb-role-switch.c








@@ -25787,7 +25787,7 @@ F:	Documentation/firmware-guide/acpi/intel-pmc-mux.rst







F:	drivers/usb/typec/mux/intel_pmc_mux.c

















USB TYPEC PI3USB30532 MUX DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-usb@vger.kernel.org









S:	Maintained









F:	drivers/usb/typec/mux/pi3usb30532.c








@@ -25816,7 +25816,7 @@ F:	drivers/usb/host/uhci*















USB VIDEO CLASS









M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-media@vger.kernel.org









S:	Maintained









W:	http://www.ideasonboard.org/uvc/








@@ -26347,7 +26347,7 @@ F:	include/uapi/linux/virtio_snd.h







F:	sound/virtio/*

















VIRTUAL BOX GUEST DEVICE DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









M:	Arnd Bergmann <arnd@arndb.de>









M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>









S:	Maintained








@@ -26356,7 +26356,7 @@ F:	include/linux/vbox_utils.h







F:	include/uapi/linux/vbox*.h

















VIRTUAL BOX SHARED FOLDER VFS DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-fsdevel@vger.kernel.org









S:	Maintained









F:	fs/vboxsf/*








@@ -26610,7 +26610,7 @@ F:	drivers/mmc/host/wbsd.*















WACOM PROTOCOL 4 SERIAL TABLETS









M:	Julian Squires <julian@cipht.net>









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	linux-input@vger.kernel.org









S:	Maintained









F:	drivers/input/tablet/wacom_serial4.c








@@ -26777,7 +26777,7 @@ F:	include/linux/wwan.h







F:	include/uapi/linux/wwan.h

















X-POWERS AXP288 PMIC DRIVERS









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









S:	Maintained









F:	drivers/acpi/pmic/intel_pmic_xpower.c









N:	axp288








@@ -26869,14 +26869,14 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/mm







F:	arch/x86/mm/

















X86 PLATFORM ANDROID TABLETS DSDT FIXUP DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git









F:	drivers/platform/x86/x86-android-tablets/

















X86 PLATFORM DRIVERS









M:	Hans de Goede <hdegoede@redhat.com>









M:	Hans de Goede <hansg@kernel.org>









M:	Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained

























arch/x86/kernel/cpu/amd.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -9,7 +9,7 @@







#include <linux/sched/clock.h>









#include <linux/random.h>









#include <linux/topology.h>









#include <asm/amd/fch.h>









#include <linux/platform_data/x86/amd-fch.h>









#include <asm/processor.h>









#include <asm/apic.h>









#include <asm/cacheinfo.h>
































drivers/i2c/busses/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -200,7 +200,7 @@ config I2C_ISMT

















config I2C_PIIX4









	tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"









	depends on PCI && HAS_IOPORT && X86









	depends on PCI && HAS_IOPORT









	select I2C_SMBUS









	help









	  If you say yes to this option, support will be included for the Intel