Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ACPI / scan: Create platform device for INT33FE ACPI nodes

Browse source 
[ Upstream commit 589edb56b424876cbbf61547b987a1f57d7ea99d ]

Bay and Cherry Trail devices with a Dollar Cove or Whiskey Cove PMIC
have an ACPI node with a HID of INT33FE which is a "virtual" battery
device implementing a standard ACPI battery interface which depends upon
a proprietary, undocument OpRegion called BMOP. Since we do have docs
for the actual fuel-gauges used on these boards we instead use native
fuel-gauge drivers talking directly to the fuel-gauge ICs on boards which
rely on this INT33FE device for their battery monitoring.

On boards with a Dollar Cove PMIC the INT33FE device's resources (_CRS)
describe a non-existing I2C client at address 0x6b with a bus-speed of
100KHz. This is a problem on some boards since there are actual devices
on that same bus which need a speed of 400KHz to function properly.

This commit adds the INT33FE HID to the list of devices with I2C resources
which should be enumerated as a platform-device rather then letting the
i2c-core instantiate an i2c-client matching the first I2C resource,
so that its bus-speed will not influence the max speed of the I2C bus.
This fixes e.g. the touchscreen not working on the Teclast X98 II Plus.

The INT33FE device on boards with a Whiskey Cove PMIC is somewhat special.
Its first I2C resource is for a secondary I2C address of the PMIC itself,
which is already described in an ACPI device with an INT34D3 HID.

But it has 3 more I2C resources describing 3 other chips for which we do
need to instantiate I2C clients and which need device-connections added
between them for things to work properly. This special case is handled by
the drivers/platform/x86/intel_cht_int33fe.c code.

Before this commit that code was binding to the i2c-client instantiated
for the secondary I2C address of the PMIC, since we now instantiate a
platform device for the INT33FE device instead, this commit also changes
the intel_cht_int33fe driver from an i2c driver to a platform driver.

This also brings the intel_cht_int33fe drv inline with how we instantiate
multiple i2c clients from a single ACPI device in other cases, as done
by the drivers/platform/x86/i2c-multi-instantiate.c code.

Reported-and-tested-by: Alexander Meiler <alex.meiler@protonmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hans de Goede 2018-10-17 10:59:28 +02:00 committed by Greg Kroah-Hartman
parent cb6a3096ec
commit cf800f2b63
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/acpi/scan.c
View file

@ -1550,6 +1550,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
*/ */
static const struct acpi_device_id i2c_multi_instantiate_ids[] = { static const struct acpi_device_id i2c_multi_instantiate_ids[] = {
{"BSG1160", }, {"BSG1160", },
{"INT33FE", },
{} {}
}; };

24
drivers/platform/x86/intel_cht_int33fe.c
View file

@ -24,6 +24,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -88,9 +89,9 @@ static const struct property_entry fusb302_props[] = {
{ } { }
}; };
static int cht_int33fe_probe(struct i2c_client *client) static int cht_int33fe_probe(struct platform_device *pdev)
{ {
struct device *dev = &client->dev; struct device *dev = &pdev->dev;
struct i2c_board_info board_info; struct i2c_board_info board_info;
struct cht_int33fe_data *data; struct cht_int33fe_data *data;
struct i2c_client *max17047; struct i2c_client *max17047;
@ -207,7 +208,7 @@ static int cht_int33fe_probe(struct i2c_client *client)
if (!data->pi3usb30532) if (!data->pi3usb30532)
goto out_unregister_fusb302; goto out_unregister_fusb302;
i2c_set_clientdata(client, data); platform_set_drvdata(pdev, data);
return 0; return 0;
@ -223,9 +224,9 @@ static int cht_int33fe_probe(struct i2c_client *client)
return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */ return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
} }
static int cht_int33fe_remove(struct i2c_client *i2c) static int cht_int33fe_remove(struct platform_device *pdev)
{ {
struct cht_int33fe_data *data = i2c_get_clientdata(i2c); struct cht_int33fe_data *data = platform_get_drvdata(pdev);
i2c_unregister_device(data->pi3usb30532); i2c_unregister_device(data->pi3usb30532);
i2c_unregister_device(data->fusb302); i2c_unregister_device(data->fusb302);
@ -237,29 +238,22 @@ static int cht_int33fe_remove(struct i2c_client *i2c)
return 0; return 0;
} }
static const struct i2c_device_id cht_int33fe_i2c_id[] = {
{ }
};
MODULE_DEVICE_TABLE(i2c, cht_int33fe_i2c_id);
static const struct acpi_device_id cht_int33fe_acpi_ids[] = { static const struct acpi_device_id cht_int33fe_acpi_ids[] = {
{ "INT33FE", }, { "INT33FE", },
{ } { }
}; };
MODULE_DEVICE_TABLE(acpi, cht_int33fe_acpi_ids); MODULE_DEVICE_TABLE(acpi, cht_int33fe_acpi_ids);
static struct i2c_driver cht_int33fe_driver = { static struct platform_driver cht_int33fe_driver = {
.driver = { .driver = {
.name = "Intel Cherry Trail ACPI INT33FE driver", .name = "Intel Cherry Trail ACPI INT33FE driver",
.acpi_match_table = ACPI_PTR(cht_int33fe_acpi_ids), .acpi_match_table = ACPI_PTR(cht_int33fe_acpi_ids),
}, },
.probe_new = cht_int33fe_probe, .probe = cht_int33fe_probe,
.remove = cht_int33fe_remove, .remove = cht_int33fe_remove,
.id_table = cht_int33fe_i2c_id,
.disable_i2c_core_irq_mapping = true,
}; };
module_i2c_driver(cht_int33fe_driver); module_platform_driver(cht_int33fe_driver);
MODULE_DESCRIPTION("Intel Cherry Trail ACPI INT33FE pseudo device driver"); MODULE_DESCRIPTION("Intel Cherry Trail ACPI INT33FE pseudo device driver");
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>"); MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");