Merge tag 'platform-drivers-x86-v5.4-2' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform-drivers fixes from Andy Shevchenko:

 - Fix compilation error of ASUS WMI driver when CONFIG_ACPI_BATTERY=n

 - Fix I²C multi-instantiate driver to work with several USB PD devices

 - Fix boot issue on Siemens SIMATIC IPC277E when PMC critical clock is
   being disabled

 - Plenty of fixes to Intel Speed-Select Technology tools

* tag 'platform-drivers-x86-v5.4-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: i2c-multi-instantiate: Derive the device name from parent
  platform/x86: pmc_atom: Add Siemens SIMATIC IPC277E to critclk_systems DMI table
  tools/power/x86/intel-speed-select: Fix perf-profile command output
  tools/power/x86/intel-speed-select: Extend core-power command set
  tools/power/x86/intel-speed-select: Fix some debug prints
  tools/power/x86/intel-speed-select: Format get-assoc information
  tools/power/x86/intel-speed-select: Allow online/offline based on tdp
  tools/power/x86/intel-speed-select: Fix high priority core mask over count
  platform/x86: asus-wmi: Make it depend on ACPI battery API

3 files changed, 9 insertions, 1 deletions

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 1b67bb578f9f..ae21d08c65e8 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -674,6 +674,7 @@ config EEEPC_LAPTOP
 config ASUS_WMI
         tristate "ASUS WMI Driver"
         depends on ACPI_WMI
+        depends on ACPI_BATTERY
         depends on INPUT
         depends on HWMON
         depends on BACKLIGHT_CLASS_DEVICE
diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c
index 61fe341a85aa..ea68f6ed66ae 100644
--- a/drivers/platform/x86/i2c-multi-instantiate.c
+++ b/drivers/platform/x86/i2c-multi-instantiate.c
@@ -90,7 +90,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
         for (i = 0; i < multi->num_clients && inst_data[i].type; i++) {
                 memset(&board_info, 0, sizeof(board_info));
                 strlcpy(board_info.type, inst_data[i].type, I2C_NAME_SIZE);
-                snprintf(name, sizeof(name), "%s-%s.%d", match->id,
+                snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev),
                          inst_data[i].type, i);
                 board_info.dev_name = name;
                 switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) {
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
index 9aca5e7ce6d0..07d1b911e72f 100644
--- a/drivers/platform/x86/pmc_atom.c
+++ b/drivers/platform/x86/pmc_atom.c
@@ -422,6 +422,13 @@ static const struct dmi_system_id critclk_systems[] = {
                         DMI_MATCH(DMI_PRODUCT_VERSION, "6ES7647-8B"),
                 },
         },
+        {
+                .ident = "SIMATIC IPC277E",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "SIEMENS AG"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "6AV7882-0"),
+                },
+        },
         { /*sentinel*/ }
 };