Commit 2f0cf1e8 authored by Hans de Goede's avatar Hans de Goede
Browse files

platform/x86: x86-android-tablets: Add Acer Iconia One 7 B1-750 data 



The Acer Iconia One 7 B1-750 is a x86 ACPI tablet which ships with Android
x86 as factory OS. Its DSDT contains a bunch of I2C devices which are not
actually there, causing various resource conflicts. Enumeration of these
is skipped through the acpi_quirk_skip_i2c_client_enumeration().

Add support for manually instantiating the I2C + other devices which are
actually present on this tablet by adding the necessary device info to
the x86-android-tablets module.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230301092331.7038-2-hdegoede@redhat.com
parent 0e8ae77c

drivers/platform/x86/x86-android-tablets.c

+91 −10
Original line number Diff line number Diff line
@@ -265,6 +265,88 @@ static struct gpiod_lookup_table int3496_gpo2_pin22_gpios = { 
	},

};



static struct gpiod_lookup_table int3496_reference_gpios = {

	.dev_id = "intel-int3496",

	.table = {

		GPIO_LOOKUP("INT33FC:01", 15, "vbus", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("INT33FC:02", 1, "mux", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("INT33FC:02", 18, "id", GPIO_ACTIVE_HIGH),

		{ }

	},

};



/* Acer Iconia One 7 B1-750 has an Android factory img with everything hardcoded */

static const char * const acer_b1_750_mount_matrix[] = {

	"-1", "0", "0",

	"0", "1", "0",

	"0", "0", "1"

};



static const struct property_entry acer_b1_750_bma250e_props[] = {

	PROPERTY_ENTRY_STRING_ARRAY("mount-matrix", acer_b1_750_mount_matrix),

	{ }

};



static const struct software_node acer_b1_750_bma250e_node = {

	.properties = acer_b1_750_bma250e_props,

};



static const struct x86_i2c_client_info acer_b1_750_i2c_clients[] __initconst = {

	{

		/* Novatek NVT-ts touchscreen */

		.board_info = {

			.type = "NVT-ts",

			.addr = 0x34,

			.dev_name = "NVT-ts",

		},

		.adapter_path = "\\_SB_.I2C4",

		.irq_data = {

			.type = X86_ACPI_IRQ_TYPE_GPIOINT,

			.chip = "INT33FC:02",

			.index = 3,

			.trigger = ACPI_EDGE_SENSITIVE,

			.polarity = ACPI_ACTIVE_LOW,

		},

	}, {

		/* BMA250E accelerometer */

		.board_info = {

			.type = "bma250e",

			.addr = 0x18,

			.swnode = &acer_b1_750_bma250e_node,

		},

		.adapter_path = "\\_SB_.I2C3",

		.irq_data = {

			.type = X86_ACPI_IRQ_TYPE_GPIOINT,

			.chip = "INT33FC:02",

			.index = 25,

			.trigger = ACPI_LEVEL_SENSITIVE,

			.polarity = ACPI_ACTIVE_HIGH,

		},

	},

};



static struct gpiod_lookup_table acer_b1_750_goodix_gpios = {

	.dev_id = "i2c-NVT-ts",

	.table = {

		GPIO_LOOKUP("INT33FC:01", 26, "reset", GPIO_ACTIVE_LOW),

		{ }

	},

};



static struct gpiod_lookup_table * const acer_b1_750_gpios[] = {

	&acer_b1_750_goodix_gpios,

	&int3496_reference_gpios,

	NULL

};



static const struct x86_dev_info acer_b1_750_info __initconst = {

	.i2c_client_info = acer_b1_750_i2c_clients,

	.i2c_client_count = ARRAY_SIZE(acer_b1_750_i2c_clients),

	.pdev_info = int3496_pdevs,

	.pdev_count = ARRAY_SIZE(int3496_pdevs),

	.gpiod_lookup_tables = acer_b1_750_gpios,

};



/*

 * Advantech MICA-071

 * This is a standard Windows tablet, but it has an extra "quick launch" button
@@ -1298,17 +1380,8 @@ static const struct x86_i2c_client_info nextbook_ares8_i2c_clients[] __initconst 
	},

};



static struct gpiod_lookup_table nextbook_ares8_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 * const nextbook_ares8_gpios[] = {

	&nextbook_ares8_int3496_gpios,

	&int3496_reference_gpios,

	NULL

};
@@ -1435,6 +1508,14 @@ static const struct x86_dev_info xiaomi_mipad2_info __initconst = { 
};



static const struct dmi_system_id x86_android_tablet_ids[] __initconst = {

	{

		/* Acer Iconia One 7 B1-750 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),

			DMI_MATCH(DMI_PRODUCT_NAME, "VESPA2"),

		},

		.driver_data = (void *)&acer_b1_750_info,

	},

	{

		/* Advantech MICA-071 */

		.matches = {