platform: drop two fixes for 4.19+

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 0 insertions, 105 deletions

diff --git a/queue/platform-x86-pmc_atom-Add-Lex-3I380D-industrial-PC-t.patch b/queue/platform-x86-pmc_atom-Add-Lex-3I380D-industrial-PC-t.patch
deleted file mode 100644
index 9a70af1..0000000
--- a/queue/platform-x86-pmc_atom-Add-Lex-3I380D-industrial-PC-t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3d0818f5eba80fbe4c0addbfe6ddb2d19dc82cd4 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 29 Apr 2019 17:01:35 +0200
-Subject: [PATCH] platform/x86: pmc_atom: Add Lex 3I380D industrial PC to
- critclk_systems DMI table
-
-commit 3d0818f5eba80fbe4c0addbfe6ddb2d19dc82cd4 upstream.
-
-The Lex 3I380D industrial PC has 4 ethernet controllers on board
-which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems
-DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks
-as CLK_CRITICAL and they will not get turned off.
-
-Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
-Reported-and-tested-by: Semyon Verchenko <semverchenko@factor-ts.ru>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
-index c7039f52ad51..a311f48ce7c9 100644
---- a/drivers/platform/x86/pmc_atom.c
-+++ b/drivers/platform/x86/pmc_atom.c
-@@ -398,12 +398,21 @@ 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"),
-+		},
-+	},
- 	{ /*sentinel*/ }
- };
- 
--- 
-2.7.4
-
diff --git a/queue/platform-x86-pmc_atom-Add-several-Beckhoff-Automatio.patch b/queue/platform-x86-pmc_atom-Add-several-Beckhoff-Automatio.patch
deleted file mode 100644
index 235328d..0000000
--- a/queue/platform-x86-pmc_atom-Add-several-Beckhoff-Automatio.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d6423bd03031c020121da26c41a26bd5cc6d0da3 Mon Sep 17 00:00:00 2001
-From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
-Date: Thu, 2 May 2019 15:03:51 +0200
-Subject: [PATCH] platform/x86: pmc_atom: Add several Beckhoff Automation
- boards to critclk_systems DMI table
-
-commit d6423bd03031c020121da26c41a26bd5cc6d0da3 upstream.
-
-There are several Beckhoff Automation industrial PC boards which use
-pmc_plt_clk* clocks for ethernet controllers. This adds affected boards
-to 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>
-
-diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
-index a311f48ce7c9..b1d804376237 100644
---- a/drivers/platform/x86/pmc_atom.c
-+++ b/drivers/platform/x86/pmc_atom.c
-@@ -413,6 +413,30 @@ static const struct dmi_system_id critclk_systems[] = {
- 			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*/ }
- };
- 
--- 
-2.7.4
-
diff --git a/queue/series b/queue/series
index df15bcd..aff48de 100644
--- a/queue/series
+++ b/queue/series
@@ -143,8 +143,6 @@ nvme-remove-the-ifdef-around-nvme_nvm_ioctl.patch
 nvme-merge-nvme_ns_ioctl-into-nvme_ioctl.patch
 nvme-release-namespace-SRCU-protection-before-perfor.patch
 nvme-fix-memory-leak-for-power-latency-tolerance.patch
-platform-x86-pmc_atom-Add-Lex-3I380D-industrial-PC-t.patch
-platform-x86-pmc_atom-Add-several-Beckhoff-Automatio.patch
 scsi-bnx2fc-fix-incorrect-cast-to-u64-on-shift-opera.patch
 libnvdimm-Fix-compilation-warnings-with-W-1.patch
 selftests-fib_rule_tests-fix-local-IPv4-address-typo.patch