platform/x86: x86-android-tablets: Move Acer info to its own file
Hans de Goede
maintainerPATCH 1/2 platform/x86: x86-android-tablets: Move Acer info to its own file
From: Hans de Goede <[email protected]>
Acer has several x86 based Android tablets which need x86-android-tablets support to work around their broken ACPI tables.
At the moment x86-android-tablets only support one model, move this to its own file before adding support for more models to avoid needing to move more code around later.
--- .../platform/x86/x86-android-tablets/Makefile | 2 +- .../platform/x86/x86-android-tablets/acer.c | 90 +++++++++++++++++++ .../platform/x86/x86-android-tablets/other.c | 74 --------------- 3 files changed, 91 insertions(+), 75 deletions(-) create mode 100644 drivers/platform/x86/x86-android-tablets/acer.c
drivers/platform/x86/x86-android-tablets/Makefile +1 -1
@@ -6,4 +6,4 @@ obj-$(CONFIG_X86_ANDROID_TABLETS) += vexia_atla10_ec.o obj-$(CONFIG_X86_ANDROID_TABLETS) += x86-android-tablets.o x86-android-tablets-y := core.o dmi.o shared-psy-info.o \ - asus.o lenovo.o other.o + acer.o asus.o lenovo.o other.o
drivers/platform/x86/x86-android-tablets/acer.c new file +90 -0
90 lines not on this page · raw message
drivers/platform/x86/x86-android-tablets/other.c +0 -74
80 lines not on this page · raw message
Signature · 1 line
2.51.0
Hans de Goede
maintainerPATCH 2/2 platform/x86: x86-android-tablets: Add support for Acer A1-840 tablet
From: Hans de Goede <[email protected]>
Add support for the Acer Iconia One 8 A1-840 (non FHD version) tablet.
This tablet has the usual issues for tablets shipped with Android as factory OS. The DSDT is broken in various ways, so i2c_clients for various devices as well as the INT3496 platform-device for OTG extcon handling need to be instantiated manually by x86-android-tablets.
This table is special in that it is the first time a Bay Trail device has been found to use the Dollar Cove TI PMIC and the first time that the PMIC's Coulomb Counter is used as fuel-gauge.
So far this PMIC has only been used together with Cherry Trail SoCs and always in combination with a separate full-featured fuel-gauge IC.
--- .../platform/x86/x86-android-tablets/acer.c | 169 ++++++++++++++++++ .../platform/x86/x86-android-tablets/dmi.c | 10 ++ .../x86-android-tablets/x86-android-tablets.h | 1 + 3 files changed, 180 insertions(+)
drivers/platform/x86/x86-android-tablets/acer.c +169 -0
@@ -15,6 +15,175 @@#include "shared-psy-info.h" #include "x86-android-tablets.h" +/* Acer Iconia One 8 A1-840 (non FHD version) */ +static const struct property_entry acer_a1_840_bq24190_props[] = { +PROPERTY_ENTRY_REF ("monitored-battery" , &generic_lipo_4v2_battery_node), +PROPERTY_ENTRY_BOOL ("omit-battery-class" ), +PROPERTY_ENTRY_BOOL ("disable-reset" ), + { } +}; + +static const struct software_node acer_a1_840_bq24190_node = { + .properties = acer_a1_840_bq24190_props, +}; + +static const struct property_entry acer_a1_840_touchscreen_props[] = { +PROPERTY_ENTRY_U32 ("touchscreen-size-x" ,800 ), +PROPERTY_ENTRY_U32 ("touchscreen-size-y" ,1280 ), + { } +}; + +static const struct software_node acer_a1_840_touchscreen_node = { + .properties = acer_a1_840_touchscreen_props, +}; + +static const struct x86_i2c_client_info acer_a1_840_i2c_clients[]__initconst = { + { +/* BQ24297 charger IC */ + .board_info = { + .type ="bq24297" , + .addr =0x6b , + .dev_name ="bq24297" , + .swnode = &acer_a1_840_bq24190_node, + .platform_data = &bq24190_pdata, + }, + .adapter_path ="\\_SB_.I2C1" , + .irq_data = { + .type =X86_ACPI_IRQ_TYPE_GPIOINT , + .chip ="INT33FC:02" , + .index =2 , + .trigger =ACPI_EDGE_SENSITIVE , + .polarity =ACPI_ACTIVE_LOW , + .con_id ="bq24297_irq" , + }, + }, { +/* MPU6515 sensors */ + .board_info = { + .type ="mpu6515" , + .addr =0x69 , + .dev_name ="mpu6515" , + }, + .adapter_path ="\\_SB_.I2C3" , + .irq_data = { + .type =X86_ACPI_IRQ_TYPE_APIC , + .index =0x47 , + .trigger =ACPI_EDGE_SENSITIVE , + .polarity =ACPI_ACTIVE_HIGH , + }, + }, { +/* FT5416 touchscreen controller */ + .board_info = { + .type ="edt-ft5x06" , + .addr =0x38 , + .dev_name ="ft5416" , + .swnode = &acer_a1_840_touchscreen_node, + }, + .adapter_path ="\\_SB_.I2C4" , + .irq_data = { + .type =X86_ACPI_IRQ_TYPE_APIC , + .index =0x45 , + .trigger =ACPI_EDGE_SENSITIVE , + .polarity =ACPI_ACTIVE_HIGH , + }, + } +}; + +struct gpiod_lookup_table acer_a1_840_int3496_gpios = { + .dev_id ="intel-int3496" , + .table = { +GPIO_LOOKUP ("INT33FC:02" ,1 ,"mux" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("INT33FC:02" ,18 ,"id" ,GPIO_ACTIVE_HIGH ), + { } + }, +}; + +static struct gpiod_lookup_table acer_a1_840_ft5416_gpios = { + .dev_id ="i2c-ft5416" , + .table = { +GPIO_LOOKUP ("INT33FC:01" ,26 ,"reset" ,GPIO_ACTIVE_LOW ), + { } + }, +}; + +static struct gpiod_lookup_table acer_a1_840_fuel_gauge_gpios = { + .dev_id ="chtdc_ti_battery" , + .table = { +GPIO_LOOKUP ("INT33FC:02" ,10 ,"charged" ,GPIO_ACTIVE_HIGH ), + { } + }, +}; + +static struct gpiod_lookup_table *const acer_a1_840_gpios[] = { + &acer_a1_840_int3496_gpios, + &acer_a1_840_ft5416_gpios, + &acer_a1_840_fuel_gauge_gpios, +NULL +}; + +/* Properties for the Dollar Cove TI PMIC battery MFD child used as fuel-gauge */ +static const struct property_entry acer_a1_840_fg_props[] = { +PROPERTY_ENTRY_REF ("monitored-battery" , &generic_lipo_4v2_battery_node), +PROPERTY_ENTRY_STRING_ARRAY_LEN ("supplied-from" , bq24190_psy,1 ), + { } +}; + +static struct device *acer_a1_840_fg_dev; +static struct fwnode_handle *acer_a1_840_fg_node; + +static int __init acer_a1_840_init (struct device *dev) +{ +int ret; + + acer_a1_840_fg_dev =bus_find_device_by_name (&platform_bus_type,NULL ,"chtdc_ti_battery" ); +if (!acer_a1_840_fg_dev) +return dev_err_probe (dev, -EPROBE_DEFER ,"getting chtdc_ti_battery dev\n" ); + + acer_a1_840_fg_node =fwnode_create_software_node (acer_a1_840_fg_props,NULL ); +if (IS_ERR (acer_a1_840_fg_node)) { + ret =PTR_ERR (acer_a1_840_fg_node); + goto err_put; + } + + ret =device_add_software_node (acer_a1_840_fg_dev, +to_software_node (acer_a1_840_fg_node)); +if (ret) + goto err_put; + +return 0 ; + +err_put: +fwnode_handle_put (acer_a1_840_fg_node); + acer_a1_840_fg_node =NULL ; +put_device (acer_a1_840_fg_dev); + acer_a1_840_fg_dev =NULL ; +return ret; +} + +static void acer_a1_840_exit (void ) +{ +device_remove_software_node (acer_a1_840_fg_dev); +/* +* Skip fwnode_handle_put(acer_a1_840_fg_node), instead leak the node. +* The intel_dc_ti_battery driver may still reference the strdup-ed +* "supplied-from" string. This string will be free-ed if the node +* is released. +*/ + acer_a1_840_fg_node =NULL ; +put_device (acer_a1_840_fg_dev); + acer_a1_840_fg_dev =NULL ; +} + +const struct x86_dev_info acer_a1_840_info__initconst = { + .i2c_client_info = acer_a1_840_i2c_clients, + .i2c_client_count =ARRAY_SIZE (acer_a1_840_i2c_clients), + .pdev_info = int3496_pdevs, + .pdev_count =1 , + .gpiod_lookup_tables = acer_a1_840_gpios, + .bat_swnode = &generic_lipo_4v2_battery_node, + .init = acer_a1_840_init, + .exit = acer_a1_840_exit, +}; +/* Acer Iconia One 7 B1-750 has an Android factory image with everything hardcoded */ static const char *const acer_b1_750_mount_matrix[] = {"-1" ,"0" ,"0" ,
drivers/platform/x86/x86-android-tablets/dmi.c +10 -0
@@ -16,6 +16,16 @@#include "x86-android-tablets.h" const struct dmi_system_id x86_android_tablet_ids[]__initconst = { + { +/* Acer Iconia One 8 A1-840 (non FHD version) */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Insyde" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"BayTrail" ), +/* Above strings are too generic also match BIOS date */ +DMI_MATCH (DMI_BIOS_DATE ,"04/01/2014" ), + }, + .driver_data = (void *)&acer_a1_840_info, + }, {/* Acer Iconia One 7 B1-750 */ .matches = {
drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +1 -0
@@ -110,6 +110,7 @@ int x86_acpi_irq_helper_get(const struct x86_acpi_irq_data *data);* Extern declarations of x86_dev_info structs so there can be a single * MODULE_DEVICE_TABLE(dmi, ...), while splitting the board descriptions. */ +extern const struct x86_dev_info acer_a1_840_info;extern const struct x86_dev_info acer_b1_750_info;extern const struct x86_dev_info advantech_mica_071_info;extern const struct x86_dev_info asus_me176c_info;
Signature · 1 line
2.51.0
Re: [PATCH 2/2] platform/x86: x86-android-tablets: Add support for Acer A1-840 tablet
Quoted 10 lines · Hans de Goede
From: Hans de Goede <[email protected]>
Add support for the Acer Iconia One 8 A1-840 (non FHD version) tablet.
This tablet has the usual issues for tablets shipped with Android as factory OS. The DSDT is broken in various ways, so
i2c_clientsfor various devices as well as the INT3496 platform-device for OTG extcon handling need to be instantiated manually by x86-android-tablets.
Quoted 6 lines
This table is special in that it is the first time a Bay Trail device has been found to use the Dollar Cove TI PMIC and the first time that the PMIC's Coulomb Counter is used as fuel-gauge.
So far this PMIC has only been used together with Cherry Trail SoCs and always in combination with a separate full-featured fuel-gauge IC.
Indeed, an interesting combination. Perhaps due to some cost savings on the BoM.
...
Both patches LGTM, but I have a question. Do you plan to move to software nodes for the GPIOs, so Dmitry will have less work to convert them? If so, perhaps it should be a patch in the middle to convert the new file to use swnode, or the precursor that converts the whole driver beforehand. What do you think?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Hans de Goede
maintainerRe: [PATCH 2/2] platform/x86: x86-android-tablets: Add support for Acer A1-840 tablet
Hi Andy,
Quoted 20 lines · Andy Shevchenko
Quoted 10 lines · Hans de Goede
From: Hans de Goede <[email protected]>
Add support for the Acer Iconia One 8 A1-840 (non FHD version) tablet.
This tablet has the usual issues for tablets shipped with Android as factory OS. The DSDT is broken in various ways, so
i2c_clientsfor various devices as well as the INT3496 platform-device for OTG extcon handling need to be instantiated manually by x86-android-tablets.Quoted 6 lines
This table is special in that it is the first time a Bay Trail device has been found to use the Dollar Cove TI PMIC and the first time that the PMIC's Coulomb Counter is used as fuel-gauge.
So far this PMIC has only been used together with Cherry Trail SoCs and always in combination with a separate full-featured fuel-gauge IC.
Indeed, an interesting combination. Perhaps due to some cost savings on the BoM.
Quoted 7 lines
...
Both patches LGTM, but I have a question. Do you plan to move to software nodes for the GPIOs, so Dmitry will have less work to convert them? If so, perhaps it should be a patch in the middle to convert the new file to use swnode, or the precursor that converts the whole driver beforehand. What do you think?
Good point.
Lets delay this series till after Dmitry's software-node GPIO changes have been tested (by me, hopefully soon) and landed and then I'll rebase this on top and also use swnodes here.
Regards,
Hans