From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 17 Sep 2019 13:24:04 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.14.145~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dce38b3ecc925a03a58b072cee2dbea27ff240db;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

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

diff --git a/queue-4.19/platform-x86-pmc_atom-add-cb4063-beckhoff-automation-board-to-critclk_systems-dmi-table.patch b/queue-4.19/platform-x86-pmc_atom-add-cb4063-beckhoff-automation-board-to-critclk_systems-dmi-table.patch
new file mode 100644
index 00000000000..8c930155c8b
--- /dev/null
+++ b/queue-4.19/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
+@@ -423,6 +423,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.19/series b/queue-4.19/series
index 4467685fedf..c557b8ae703 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -44,3 +44,4 @@ revert-bluetooth-btusb-driver-to-enable-the-usb-wakeup-feature.patch
 iio-adc-stm32-dfsdm-fix-data-type.patch
 modules-fix-bug-when-load-module-with-rodata-n.patch
 modules-fix-compile-error-if-don-t-have-strict-module-rwx.patch
+platform-x86-pmc_atom-add-cb4063-beckhoff-automation-board-to-critclk_systems-dmi-table.patch