Commit 19b07cb4 authored by Pali Rohár's avatar Pali Rohár Committed by Wolfram Sang
Browse files

i2c: i801: Register optional lis3lv02d I2C device on Dell machines 



Dell platform team told us that some (DMI whitelisted) Dell Latitude
machines have ST microelectronics accelerometer at I2C address 0x29.

Presence of that ST microelectronics accelerometer is verified by existence
of SMO88xx ACPI device which represent that accelerometer. Unfortunately
ACPI device does not specify I2C address.

This patch registers lis3lv02d device for selected Dell Latitude machines
at I2C address 0x29 after detection. And for Dell Vostro V131 machine at
I2C address 0x1d which was manually detected.

Finally commit a7ae8195 ("i2c: i801: Allow ACPI SystemIO OpRegion to
conflict with PCI BAR") allowed to use i2c-i801 driver on Dell machines so
lis3lv02d correctly initialize accelerometer.

Tested on Dell Latitude E6440.

Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent f0e4cd94

drivers/i2c/busses/i2c-i801.c

+117 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,120 @@ static void dmi_check_onboard_devices(const struct dmi_header *dm, void *adap) 
	}

}



/* NOTE: Keep this list in sync with drivers/platform/x86/dell-smo8800.c */

static const char *const acpi_smo8800_ids[] = {

	"SMO8800",

	"SMO8801",

	"SMO8810",

	"SMO8811",

	"SMO8820",

	"SMO8821",

	"SMO8830",

	"SMO8831",

};



static acpi_status check_acpi_smo88xx_device(acpi_handle obj_handle,

					     u32 nesting_level,

					     void *context,

					     void **return_value)

{

	struct acpi_device_info *info;

	acpi_status status;

	char *hid;

	int i;



	status = acpi_get_object_info(obj_handle, &info);

	if (!ACPI_SUCCESS(status) || !(info->valid & ACPI_VALID_HID))

		return AE_OK;



	hid = info->hardware_id.string;

	if (!hid)

		return AE_OK;



	for (i = 0; i < ARRAY_SIZE(acpi_smo8800_ids); ++i) {

		if (strcmp(hid, acpi_smo8800_ids[i]) == 0) {

			*((bool *)return_value) = true;

			return AE_CTRL_TERMINATE;

		}

	}



	return AE_OK;

}



static bool is_dell_system_with_lis3lv02d(void)

{

	bool found;

	const char *vendor;



	vendor = dmi_get_system_info(DMI_SYS_VENDOR);

	if (strcmp(vendor, "Dell Inc.") != 0)

		return false;



	/*

	 * Check that ACPI device SMO88xx is present and is functioning.

	 * Function acpi_get_devices() already filters all ACPI devices

	 * which are not present or are not functioning.

	 * ACPI device SMO88xx represents our ST microelectronics lis3lv02d

	 * accelerometer but unfortunately ACPI does not provide any other

	 * information (like I2C address).

	 */

	found = false;

	acpi_get_devices(NULL, check_acpi_smo88xx_device, NULL,

			 (void **)&found);



	return found;

}



/*

 * Accelerometer's I2C address is not specified in DMI nor ACPI,

 * so it is needed to define mapping table based on DMI product names.

 */

static const struct {

	const char *dmi_product_name;

	unsigned short i2c_addr;

} dell_lis3lv02d_devices[] = {

	/*

	 * Dell platform team told us that these Latitude devices have

	 * ST microelectronics accelerometer at I2C address 0x29.

	 */

	{ "Latitude E5250",     0x29 },

	{ "Latitude E5450",     0x29 },

	{ "Latitude E5550",     0x29 },

	{ "Latitude E6440",     0x29 },

	{ "Latitude E6440 ATG", 0x29 },

	{ "Latitude E6540",     0x29 },

	/*

	 * Additional individual entries were added after verification.

	 */

	{ "Vostro V131",        0x1d },

};



static void register_dell_lis3lv02d_i2c_device(struct i801_priv *priv)

{

	struct i2c_board_info info;

	const char *dmi_product_name;

	int i;



	dmi_product_name = dmi_get_system_info(DMI_PRODUCT_NAME);

	for (i = 0; i < ARRAY_SIZE(dell_lis3lv02d_devices); ++i) {

		if (strcmp(dmi_product_name,

			   dell_lis3lv02d_devices[i].dmi_product_name) == 0)

			break;

	}



	if (i == ARRAY_SIZE(dell_lis3lv02d_devices)) {

		dev_warn(&priv->pci_dev->dev,

			 "Accelerometer lis3lv02d is present on SMBus but its"

			 " address is unknown, skipping registration\n");

		return;

	}



	memset(&info, 0, sizeof(struct i2c_board_info));

	info.addr = dell_lis3lv02d_devices[i].i2c_addr;

	strlcpy(info.type, "lis3lv02d", I2C_NAME_SIZE);

	i2c_new_device(&priv->adapter, &info);

}



/* Register optional slaves */

static void i801_probe_optional_slaves(struct i801_priv *priv)

{
@@ -1160,6 +1274,9 @@ static void i801_probe_optional_slaves(struct i801_priv *priv) 


	if (dmi_name_in_vendors("FUJITSU"))

		dmi_walk(dmi_check_onboard_devices, &priv->adapter);



	if (is_dell_system_with_lis3lv02d())

		register_dell_lis3lv02d_i2c_device(priv);

}

#else

static void __init input_apanel_init(void) {}

drivers/platform/x86/dell-smo8800.c

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static int smo8800_remove(struct acpi_device *device) 
	return 0;

}



/* NOTE: Keep this list in sync with drivers/i2c/busses/i2c-i801.c */

static const struct acpi_device_id smo8800_ids[] = {

	{ "SMO8800", 0 },

	{ "SMO8801", 0 },

CRA Git | Maintained and supported by SUSTech CRA and CCSE