Skip to content

Commit 3343b08

Browse files
jwrdegoedeij-intel
jwrdegoede
authored and
ij-intel
committed
platform/x86: x86-android-tablets: Add "9v" to Vexia EDU ATLA 10 tablet symbols
The Vexia EDU ATLA 10 tablet comes in 2 different versions with significantly different mainboards. The only outward difference is that the charging barrel on one is marked 5V and the other is marked 9V. Both need to be handled by the x86-android-tablets code. Add 9v to the symbols for the existing support for the 9V Vexia EDU ATLA 10 tablet symbols to prepare for adding support for the 5V version. All this patch does is s/vexia_edu_atla10_info/vexia_edu_atla10_9v_info/. Signed-off-by: Hans de Goede <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Ilpo Järvinen <[email protected]> Signed-off-by: Ilpo Järvinen <[email protected]>
1 parent 6c683c6 commit 3343b08

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ const struct dmi_system_id x86_android_tablet_ids[] __initconst = {
187187
/* Above strings are too generic, also match on BIOS date */
188188
DMI_MATCH(DMI_BIOS_DATE, "08/25/2014"),
189189
},
190-
.driver_data = (void *)&vexia_edu_atla10_info,
190+
.driver_data = (void *)&vexia_edu_atla10_9v_info,
191191
},
192192
{
193193
/* Whitelabel (sold as various brands) TM800A550L */

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -599,62 +599,62 @@ const struct x86_dev_info whitelabel_tm800a550l_info __initconst = {
599599
};
600600

601601
/*
602-
* Vexia EDU ATLA 10 tablet, Android 4.2 / 4.4 + Guadalinex Ubuntu tablet
602+
* Vexia EDU ATLA 10 tablet 9V, Android 4.2 + Guadalinex Ubuntu tablet
603603
* distributed to schools in the Spanish Andalucía region.
604604
*/
605605
static const char * const crystal_cove_pwrsrc_psy[] = { "crystal_cove_pwrsrc" };
606606

607-
static const struct property_entry vexia_edu_atla10_ulpmc_props[] = {
607+
static const struct property_entry vexia_edu_atla10_9v_ulpmc_props[] = {
608608
PROPERTY_ENTRY_STRING_ARRAY("supplied-from", crystal_cove_pwrsrc_psy),
609609
{ }
610610
};
611611

612-
static const struct software_node vexia_edu_atla10_ulpmc_node = {
613-
.properties = vexia_edu_atla10_ulpmc_props,
612+
static const struct software_node vexia_edu_atla10_9v_ulpmc_node = {
613+
.properties = vexia_edu_atla10_9v_ulpmc_props,
614614
};
615615

616-
static const char * const vexia_edu_atla10_accel_mount_matrix[] = {
616+
static const char * const vexia_edu_atla10_9v_accel_mount_matrix[] = {
617617
"0", "-1", "0",
618618
"1", "0", "0",
619619
"0", "0", "1"
620620
};
621621

622-
static const struct property_entry vexia_edu_atla10_accel_props[] = {
623-
PROPERTY_ENTRY_STRING_ARRAY("mount-matrix", vexia_edu_atla10_accel_mount_matrix),
622+
static const struct property_entry vexia_edu_atla10_9v_accel_props[] = {
623+
PROPERTY_ENTRY_STRING_ARRAY("mount-matrix", vexia_edu_atla10_9v_accel_mount_matrix),
624624
{ }
625625
};
626626

627-
static const struct software_node vexia_edu_atla10_accel_node = {
628-
.properties = vexia_edu_atla10_accel_props,
627+
static const struct software_node vexia_edu_atla10_9v_accel_node = {
628+
.properties = vexia_edu_atla10_9v_accel_props,
629629
};
630630

631-
static const struct property_entry vexia_edu_atla10_touchscreen_props[] = {
631+
static const struct property_entry vexia_edu_atla10_9v_touchscreen_props[] = {
632632
PROPERTY_ENTRY_U32("hid-descr-addr", 0x0000),
633633
PROPERTY_ENTRY_U32("post-reset-deassert-delay-ms", 120),
634634
{ }
635635
};
636636

637-
static const struct software_node vexia_edu_atla10_touchscreen_node = {
638-
.properties = vexia_edu_atla10_touchscreen_props,
637+
static const struct software_node vexia_edu_atla10_9v_touchscreen_node = {
638+
.properties = vexia_edu_atla10_9v_touchscreen_props,
639639
};
640640

641-
static const struct property_entry vexia_edu_atla10_pmic_props[] = {
641+
static const struct property_entry vexia_edu_atla10_9v_pmic_props[] = {
642642
PROPERTY_ENTRY_BOOL("linux,register-pwrsrc-power_supply"),
643643
{ }
644644
};
645645

646-
static const struct software_node vexia_edu_atla10_pmic_node = {
647-
.properties = vexia_edu_atla10_pmic_props,
646+
static const struct software_node vexia_edu_atla10_9v_pmic_node = {
647+
.properties = vexia_edu_atla10_9v_pmic_props,
648648
};
649649

650-
static const struct x86_i2c_client_info vexia_edu_atla10_i2c_clients[] __initconst = {
650+
static const struct x86_i2c_client_info vexia_edu_atla10_9v_i2c_clients[] __initconst = {
651651
{
652652
/* I2C attached embedded controller, used to access fuel-gauge */
653653
.board_info = {
654654
.type = "vexia_atla10_ec",
655655
.addr = 0x76,
656656
.dev_name = "ulpmc",
657-
.swnode = &vexia_edu_atla10_ulpmc_node,
657+
.swnode = &vexia_edu_atla10_9v_ulpmc_node,
658658
},
659659
.adapter_path = "0000:00:18.1",
660660
}, {
@@ -679,7 +679,7 @@ static const struct x86_i2c_client_info vexia_edu_atla10_i2c_clients[] __initcon
679679
.type = "kxtj21009",
680680
.addr = 0x0f,
681681
.dev_name = "kxtj21009",
682-
.swnode = &vexia_edu_atla10_accel_node,
682+
.swnode = &vexia_edu_atla10_9v_accel_node,
683683
},
684684
.adapter_path = "0000:00:18.5",
685685
}, {
@@ -688,7 +688,7 @@ static const struct x86_i2c_client_info vexia_edu_atla10_i2c_clients[] __initcon
688688
.type = "hid-over-i2c",
689689
.addr = 0x38,
690690
.dev_name = "FTSC1000",
691-
.swnode = &vexia_edu_atla10_touchscreen_node,
691+
.swnode = &vexia_edu_atla10_9v_touchscreen_node,
692692
},
693693
.adapter_path = "0000:00:18.6",
694694
.irq_data = {
@@ -703,7 +703,7 @@ static const struct x86_i2c_client_info vexia_edu_atla10_i2c_clients[] __initcon
703703
.type = "intel_soc_pmic_crc",
704704
.addr = 0x6e,
705705
.dev_name = "intel_soc_pmic_crc",
706-
.swnode = &vexia_edu_atla10_pmic_node,
706+
.swnode = &vexia_edu_atla10_9v_pmic_node,
707707
},
708708
.adapter_path = "0000:00:18.7",
709709
.irq_data = {
@@ -715,28 +715,28 @@ static const struct x86_i2c_client_info vexia_edu_atla10_i2c_clients[] __initcon
715715
}
716716
};
717717

718-
static const struct x86_serdev_info vexia_edu_atla10_serdevs[] __initconst = {
718+
static const struct x86_serdev_info vexia_edu_atla10_9v_serdevs[] __initconst = {
719719
{
720720
.ctrl.pci.devfn = PCI_DEVFN(0x1e, 3),
721721
.ctrl_devname = "serial0",
722722
.serdev_hid = "OBDA8723",
723723
},
724724
};
725725

726-
static struct gpiod_lookup_table vexia_edu_atla10_ft5416_gpios = {
726+
static struct gpiod_lookup_table vexia_edu_atla10_9v_ft5416_gpios = {
727727
.dev_id = "i2c-FTSC1000",
728728
.table = {
729729
GPIO_LOOKUP("INT33FC:00", 60, "reset", GPIO_ACTIVE_LOW),
730730
{ }
731731
},
732732
};
733733

734-
static struct gpiod_lookup_table * const vexia_edu_atla10_gpios[] = {
735-
&vexia_edu_atla10_ft5416_gpios,
734+
static struct gpiod_lookup_table * const vexia_edu_atla10_9v_gpios[] = {
735+
&vexia_edu_atla10_9v_ft5416_gpios,
736736
NULL
737737
};
738738

739-
static int __init vexia_edu_atla10_init(struct device *dev)
739+
static int __init vexia_edu_atla10_9v_init(struct device *dev)
740740
{
741741
struct pci_dev *pdev;
742742
int ret;
@@ -760,13 +760,13 @@ static int __init vexia_edu_atla10_init(struct device *dev)
760760
return 0;
761761
}
762762

763-
const struct x86_dev_info vexia_edu_atla10_info __initconst = {
764-
.i2c_client_info = vexia_edu_atla10_i2c_clients,
765-
.i2c_client_count = ARRAY_SIZE(vexia_edu_atla10_i2c_clients),
766-
.serdev_info = vexia_edu_atla10_serdevs,
767-
.serdev_count = ARRAY_SIZE(vexia_edu_atla10_serdevs),
768-
.gpiod_lookup_tables = vexia_edu_atla10_gpios,
769-
.init = vexia_edu_atla10_init,
763+
const struct x86_dev_info vexia_edu_atla10_9v_info __initconst = {
764+
.i2c_client_info = vexia_edu_atla10_9v_i2c_clients,
765+
.i2c_client_count = ARRAY_SIZE(vexia_edu_atla10_9v_i2c_clients),
766+
.serdev_info = vexia_edu_atla10_9v_serdevs,
767+
.serdev_count = ARRAY_SIZE(vexia_edu_atla10_9v_serdevs),
768+
.gpiod_lookup_tables = vexia_edu_atla10_9v_gpios,
769+
.init = vexia_edu_atla10_9v_init,
770770
.use_pci = true,
771771
};
772772

‎drivers/platform/x86/x86-android-tablets/x86-android-tablets.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ extern const struct x86_dev_info nextbook_ares8_info;
127127
extern const struct x86_dev_info nextbook_ares8a_info;
128128
extern const struct x86_dev_info peaq_c1010_info;
129129
extern const struct x86_dev_info whitelabel_tm800a550l_info;
130-
extern const struct x86_dev_info vexia_edu_atla10_info;
130+
extern const struct x86_dev_info vexia_edu_atla10_9v_info;
131131
extern const struct x86_dev_info xiaomi_mipad2_info;
132132
extern const struct dmi_system_id x86_android_tablet_ids[];
133133

0 commit comments

Comments
 (0)