4.14-stable patches

added patches:
	platform-x86-pmc_atom-add-cb4063-beckhoff-automation-board-to-critclk_systems-dmi-table.patch

diff --git a/queue-4.14/platform-x86-pmc_atom-add-cb4063-beckhoff-automation-board-to-critclk_systems-dmi-table.patch b/queue-4.14/platform-x86-pmc_atom-add-cb4063-beckhoff-automation-board-to-critclk_systems-dmi-table.patch
new file mode 100644 (file)
index 0000000..9fe7880
--- /dev/null
+++ b/queue-4.14/platform-x86-pmc_atom-add-cb4063-beckhoff-automation-board-to-critclk_systems-dmi-table.patch
@@ -0,0 +1,39 @@
+From 9452fbf5c6cf5f470e0748fe7a14a683e7765f7a Mon Sep 17 00:00:00 2001
+From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
+Date: Tue, 18 Jun 2019 15:31:02 +0200
+Subject: platform/x86: pmc_atom: Add CB4063 Beckhoff Automation board to critclk_systems DMI table
+
+From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
+
+commit 9452fbf5c6cf5f470e0748fe7a14a683e7765f7a upstream.
+
+The CB4063 board uses pmc_plt_clk* clocks for ethernet controllers. This
+adds it to the critclk_systems DMI table so the clocks are marked as
+CLK_CRITICAL and not turned off.
+
+Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
+Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/platform/x86/pmc_atom.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/platform/x86/pmc_atom.c
++++ b/drivers/platform/x86/pmc_atom.c
+@@ -453,6 +453,14 @@ static const struct dmi_system_id critcl
+       },
+       {
+               /* pmc_plt_clk* - are used for ethernet controllers */
++              .ident = "Beckhoff CB4063",
++              .matches = {
++                      DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff Automation"),
++                      DMI_MATCH(DMI_BOARD_NAME, "CB4063"),
++              },
++      },
++      {
++              /* pmc_plt_clk* - are used for ethernet controllers */
+               .ident = "Beckhoff CB6263",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff Automation"),

diff --git a/queue-4.14/series b/queue-4.14/series
index 04a255c6d9a692d7cb57f77d7bc04e61bdb8e1aa..ffc835a009dbf0e0d7f7cbe07762b98638993436 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -40,3 +40,4 @@ crypto-talitos-hmac-snoop-no-afeu-mode-requires-sw-icv-checking.patch
 firmware-ti_sci-always-request-response-from-firmware.patch
 drm-mediatek-mtk_drm_drv.c-add-of_node_put-before-goto.patch
 revert-bluetooth-btusb-driver-to-enable-the-usb-wakeup-feature.patch
+platform-x86-pmc_atom-add-cb4063-beckhoff-automation-board-to-critclk_systems-dmi-table.patch