platform/x86: int3472: Add more MSI AI evo laptops

The MSI prestige AI EVO 13 and 16 have the same camera configuration
as model 14. Use the same platform data for all.

Signed-off-by: Antti Laakso <antti.laakso@linux.intel.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
[Sakari Ailus: Use user-reported board name for model 16.]
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

diff --git a/drivers/platform/x86/intel/int3472/tps68470_board_data.c b/drivers/platform/x86/intel/int3472/tps68470_board_data.c
index e65067358301f610b49fd5f2c7fa4cd708c1f023..28c9e12c85bf45f29d2995c005e59b9b4bb0ab6e 100644 (file)
--- a/drivers/platform/x86/intel/int3472/tps68470_board_data.c
+++ b/drivers/platform/x86/intel/int3472/tps68470_board_data.c
@@ -238,7 +238,7 @@ static struct regulator_consumer_supply ovti5675_dvdd_consumer_supplies[] = {
        REGULATOR_SUPPLY("dvdd", "i2c-OVTI5675:00"),
 };
 
-static const struct regulator_init_data msi_p14_ai_evo_tps68470_core_reg_init_data = {
+static const struct regulator_init_data msi_prestige_ai_evo_tps68470_core_reg_init_data = {
        .constraints = {
                .min_uV = 1200000,
                .max_uV = 1200000,
@@ -249,7 +249,7 @@ static const struct regulator_init_data msi_p14_ai_evo_tps68470_core_reg_init_da
        .consumer_supplies = ovti5675_dvdd_consumer_supplies,
 };
 
-static const struct regulator_init_data msi_p14_ai_evo_tps68470_ana_reg_init_data = {
+static const struct regulator_init_data msi_prestige_ai_evo_tps68470_ana_reg_init_data = {
        .constraints = {
                .min_uV = 2815200,
                .max_uV = 2815200,
@@ -260,7 +260,7 @@ static const struct regulator_init_data msi_p14_ai_evo_tps68470_ana_reg_init_dat
        .consumer_supplies = ovti5675_avdd_consumer_supplies,
 };
 
-static const struct regulator_init_data msi_p14_ai_evo_tps68470_vio_reg_init_data = {
+static const struct regulator_init_data msi_prestige_ai_evo_tps68470_vio_reg_init_data = {
        .constraints = {
                .min_uV = 1800600,
                .max_uV = 1800600,
@@ -269,7 +269,7 @@ static const struct regulator_init_data msi_p14_ai_evo_tps68470_vio_reg_init_dat
        },
 };
 
-static const struct regulator_init_data msi_p14_ai_evo_tps68470_vsio_reg_init_data = {
+static const struct regulator_init_data msi_prestige_ai_evo_tps68470_vsio_reg_init_data = {
        .constraints = {
                .min_uV = 1800600,
                .max_uV = 1800600,
@@ -280,12 +280,12 @@ static const struct regulator_init_data msi_p14_ai_evo_tps68470_vsio_reg_init_da
        .consumer_supplies = ovti5675_dovdd_consumer_supplies,
 };
 
-static const struct tps68470_regulator_platform_data msi_p14_ai_evo_tps68470_pdata = {
+static const struct tps68470_regulator_platform_data msi_prestige_ai_evo_tps68470_pdata = {
        .reg_init_data = {
-               [TPS68470_CORE] = &msi_p14_ai_evo_tps68470_core_reg_init_data,
-               [TPS68470_ANA]  = &msi_p14_ai_evo_tps68470_ana_reg_init_data,
-               [TPS68470_VIO]  = &msi_p14_ai_evo_tps68470_vio_reg_init_data,
-               [TPS68470_VSIO] = &msi_p14_ai_evo_tps68470_vsio_reg_init_data,
+               [TPS68470_CORE] = &msi_prestige_ai_evo_tps68470_core_reg_init_data,
+               [TPS68470_ANA]  = &msi_prestige_ai_evo_tps68470_ana_reg_init_data,
+               [TPS68470_VIO]  = &msi_prestige_ai_evo_tps68470_vio_reg_init_data,
+               [TPS68470_VSIO] = &msi_prestige_ai_evo_tps68470_vsio_reg_init_data,
        },
 };
 
@@ -315,7 +315,7 @@ static struct gpiod_lookup_table dell_7212_int3479_gpios = {
        }
 };
 
-static struct gpiod_lookup_table msi_p14_ai_evo_ovti5675_gpios = {
+static struct gpiod_lookup_table msi_prestige_ai_evo_ovti5675_gpios = {
        .dev_id = "i2c-OVTI5675:00",
        .table = {
                GPIO_LOOKUP("tps68470-gpio", 9, "reset", GPIO_ACTIVE_LOW),
@@ -323,13 +323,13 @@ static struct gpiod_lookup_table msi_p14_ai_evo_ovti5675_gpios = {
        }
 };
 
-static const struct property_entry msi_p14_ai_evo_gpio_props[] = {
+static const struct property_entry msi_prestige_ai_evo_gpio_props[] = {
        PROPERTY_ENTRY_BOOL("daisy-chain-enable"),
        { }
 };
 
-static const struct software_node msi_p14_ai_evo_tps68470_gpio_swnode = {
-       .properties = msi_p14_ai_evo_gpio_props,
+static const struct software_node msi_prestige_ai_evo_tps68470_gpio_swnode = {
+       .properties = msi_prestige_ai_evo_gpio_props,
 };
 
 static const struct int3472_tps68470_board_data surface_go_tps68470_board_data = {
@@ -361,13 +361,13 @@ static const struct int3472_tps68470_board_data dell_7212_tps68470_board_data =
        },
 };
 
-static const struct int3472_tps68470_board_data msi_p14_ai_evo_tps68470_board_data = {
+static const struct int3472_tps68470_board_data msi_prestige_ai_evo_tps68470_board_data = {
        .dev_name = "i2c-INT3472:06",
-       .tps68470_regulator_pdata = &msi_p14_ai_evo_tps68470_pdata,
-       .tps68470_gpio_swnode = &msi_p14_ai_evo_tps68470_gpio_swnode,
+       .tps68470_regulator_pdata = &msi_prestige_ai_evo_tps68470_pdata,
+       .tps68470_gpio_swnode = &msi_prestige_ai_evo_tps68470_gpio_swnode,
        .n_gpiod_lookups = 1,
        .tps68470_gpio_lookup_tables = {
-               &msi_p14_ai_evo_ovti5675_gpios,
+               &msi_prestige_ai_evo_ovti5675_gpios,
        },
 };
 
@@ -400,13 +400,29 @@ static const struct dmi_system_id int3472_tps68470_board_data_table[] = {
                },
                .driver_data = (void *)&dell_7212_tps68470_board_data,
        },
+       {
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Micro-Star International Co., Ltd."),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Prestige 13 AI+ Evo A2VMG"),
+                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "MS-13Q3"),
+               },
+               .driver_data = (void *)&msi_prestige_ai_evo_tps68470_board_data,
+       },
        {
                .matches = {
                        DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Micro-Star International Co., Ltd."),
                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Prestige 14 AI+ Evo C2VMG"),
                        DMI_EXACT_MATCH(DMI_BOARD_NAME, "MS-14N3"),
                },
-               .driver_data = (void *)&msi_p14_ai_evo_tps68470_board_data,
+               .driver_data = (void *)&msi_prestige_ai_evo_tps68470_board_data,
+       },
+       {
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Micro-Star International Co., Ltd."),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Prestige 16 AI+ Evo B2VMG"),
+                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "MS-15A3"),
+               },
+               .driver_data = (void *)&msi_prestige_ai_evo_tps68470_board_data,
        },
        { }
 };