Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b086aa9 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices() 

[ Upstream commit 21653a4181ff292480599dad996a2b759ccf050f ]

Some ACPI i2c-devices _STA method (which is used to detect if the device
is present) use autodetection code which probes which device is present
over i2c. This requires the I2C ACPI OpRegion handler to be registered
before we enumerate i2c-clients under the i2c-adapter.

This fixes the i2c touchpad on the Lenovo ThinkBook 14-IIL and
ThinkBook 15 IIL not getting an i2c-client instantiated and thus not
working.

BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1842039


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent efa34358

drivers/i2c/i2c-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1858,8 +1858,8 @@ static int i2c_register_adapter(struct i2c_adapter *adap) 


	/* create pre-declared device nodes */

	of_i2c_register_devices(adap);

	i2c_acpi_register_devices(adap);

	i2c_acpi_install_space_handler(adap);

	i2c_acpi_register_devices(adap);



	if (adap->nr < __i2c_first_dynamic_bus_num)

		i2c_scan_static_board_info(adap);