Merge tag 'mm-nonmm-stable-2024-03-14-09-36' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / drivers / hwmon / dell-smm-hwmon.c

diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index 88e48e3..efcf786 100644 (file)
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -1450,10 +1450,15 @@ struct i8k_fan_control_data {
 };
 
 enum i8k_fan_controls {
+       I8K_FAN_30A3_31A3,
        I8K_FAN_34A3_35A3,
 };
 
 static const struct i8k_fan_control_data i8k_fan_control_data[] __initconst = {
+       [I8K_FAN_30A3_31A3] = {
+               .manual_fan = 0x30a3,
+               .auto_fan = 0x31a3,
+       },
        [I8K_FAN_34A3_35A3] = {
                .manual_fan = 0x34a3,
                .auto_fan = 0x35a3,
@@ -1517,6 +1522,14 @@ static const struct dmi_system_id i8k_whitelist_fan_control[] __initconst = {
                },
                .driver_data = (void *)&i8k_fan_control_data[I8K_FAN_34A3_35A3],
        },
+       {
+               .ident = "Dell XPS 9315",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "XPS 9315"),
+               },
+               .driver_data = (void *)&i8k_fan_control_data[I8K_FAN_30A3_31A3],
+       },
        { }
 };
 
@@ -1587,6 +1600,7 @@ static struct wmi_driver dell_smm_wmi_driver = {
        },
        .id_table = dell_smm_wmi_id_table,
        .probe = dell_smm_wmi_probe,
+       .no_singleton = true,
 };
 
 /*