|
|
@@ -94,6 +94,11 @@ static const struct acpi_device_id battery_device_ids[] = {
|
|
|
|
|
|
MODULE_DEVICE_TABLE(acpi, battery_device_ids);
|
|
|
|
|
|
+/* Lists of PMIC ACPI HIDs with an (often better) native battery driver */
|
|
|
+static const char * const acpi_battery_blacklist[] = {
|
|
|
+ "INT33F4", /* X-Powers AXP288 PMIC */
|
|
|
+};
|
|
|
+
|
|
|
enum {
|
|
|
ACPI_BATTERY_ALARM_PRESENT,
|
|
|
ACPI_BATTERY_XINFO_PRESENT,
|
|
|
@@ -1316,8 +1321,17 @@ static struct acpi_driver acpi_battery_driver = {
|
|
|
|
|
|
static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
|
|
|
{
|
|
|
+ unsigned int i;
|
|
|
int result;
|
|
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(acpi_battery_blacklist); i++)
|
|
|
+ if (acpi_dev_present(acpi_battery_blacklist[i], "1", -1)) {
|
|
|
+ pr_info(PREFIX ACPI_BATTERY_DEVICE_NAME
|
|
|
+ ": found native %s PMIC, not loading\n",
|
|
|
+ acpi_battery_blacklist[i]);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
dmi_check_system(bat_dmi_table);
|
|
|
|
|
|
#ifdef CONFIG_ACPI_PROCFS_POWER
|