Merge tag 'platform-drivers-x86-v5.2-2' of git://git.infradead.org/linux-platform...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 May 2019 17:19:26 +0000 (10:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 May 2019 17:19:26 +0000 (10:19 -0700)
Pull x86 platform driver fixes from Andy Shevchenko:
 "Some of Intel Cherrytrail based platforms depend on PMC clock to be
  always on. Here are a couple of quirks to the driver to support
  affected hardware"

* tag 'platform-drivers-x86-v5.2-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: pmc_atom: Add several Beckhoff Automation boards to critclk_systems DMI table
  platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table

drivers/platform/x86/pmc_atom.c

index c7039f5..b1d8043 100644 (file)
@@ -398,12 +398,45 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)
  */
 static const struct dmi_system_id critclk_systems[] = {
        {
+               /* pmc_plt_clk0 is used for an external HSIC USB HUB */
                .ident = "MPL CEC1x",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "MPL AG"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "CEC10 Family"),
                },
        },
+       {
+               /* pmc_plt_clk0 - 3 are used for the 4 ethernet controllers */
+               .ident = "Lex 3I380D",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Lex BayTrail"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "3I380D"),
+               },
+       },
+       {
+               /* pmc_plt_clk* - are used for ethernet controllers */
+               .ident = "Beckhoff CB3163",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff Automation"),
+                       DMI_MATCH(DMI_BOARD_NAME, "CB3163"),
+               },
+       },
+       {
+               /* pmc_plt_clk* - are used for ethernet controllers */
+               .ident = "Beckhoff CB6263",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff Automation"),
+                       DMI_MATCH(DMI_BOARD_NAME, "CB6263"),
+               },
+       },
+       {
+               /* pmc_plt_clk* - are used for ethernet controllers */
+               .ident = "Beckhoff CB6363",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff Automation"),
+                       DMI_MATCH(DMI_BOARD_NAME, "CB6363"),
+               },
+       },
        { /*sentinel*/ }
 };