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

Commit a3dd034a authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

ACPI / scan: Create platform device for INT3515 ACPI nodes 



The ACPI device with INT3515 _HID is representing a complex USB PD
hardware infrastructure which includes several I2C slave ICs.

We add an ID to the I2C multi instantiate list to enumerate
all I2C slaves correctly.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 2336dfad

drivers/acpi/scan.c

+1 −0
Original line number Diff line number Diff line
@@ -1541,6 +1541,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) 
	static const struct acpi_device_id i2c_multi_instantiate_ids[] = {

		{"BSG1160", },

		{"INT33FE", },

		{"INT3515", },

		{}

	};

drivers/platform/x86/i2c-multi-instantiate.c

+9 −0
Original line number Diff line number Diff line
@@ -159,12 +159,21 @@ static const struct i2c_inst_data bsg1160_data[] = { 
	{}

};



static const struct i2c_inst_data int3515_data[]  = {

	{ "tps6598x", IRQ_RESOURCE_APIC, 0 },

	{ "tps6598x", IRQ_RESOURCE_APIC, 1 },

	{ "tps6598x", IRQ_RESOURCE_APIC, 2 },

	{ "tps6598x", IRQ_RESOURCE_APIC, 3 },

	{}

};



/*

 * Note new device-ids must also be added to i2c_multi_instantiate_ids in

 * drivers/acpi/scan.c: acpi_device_enumeration_by_parent().

 */

static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = {

	{ "BSG1160", (unsigned long)bsg1160_data },

	{ "INT3515", (unsigned long)int3515_data },

	{ }

};

MODULE_DEVICE_TABLE(acpi, i2c_multi_inst_acpi_ids);

drivers/usb/typec/tps6598x.c

+4 −4
Original line number Diff line number Diff line
@@ -501,19 +501,19 @@ static int tps6598x_remove(struct i2c_client *client) 
	return 0;

}



static const struct acpi_device_id tps6598x_acpi_match[] = {

	{ "INT3515", 0 },

static const struct i2c_device_id tps6598x_id[] = {

	{ "tps6598x" },

	{ }

};

MODULE_DEVICE_TABLE(acpi, tps6598x_acpi_match);

MODULE_DEVICE_TABLE(i2c, tps6598x_id);



static struct i2c_driver tps6598x_i2c_driver = {

	.driver = {

		.name = "tps6598x",

		.acpi_match_table = tps6598x_acpi_match,

	},

	.probe_new = tps6598x_probe,

	.remove = tps6598x_remove,

	.id_table = tps6598x_id,

};

module_i2c_driver(tps6598x_i2c_driver);