From: Greg Kroah-Hartman Date: Tue, 17 Sep 2019 13:23:46 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.14.145~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1882a7967a99200a7ecf1bc576efa3391a13251;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..9fe7880ef78 --- /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 +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 + +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 +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + 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 04a255c6d9a..ffc835a009d 100644 --- 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