[D,1/3] Revert "UBUNTU: SAUCE: mfd: intel-lpss: add quirk for Dell XPS 13 7390 2-in-1"
diff mbox series

Message ID 20191126050308.7225-2-kai.heng.feng@canonical.com
State New
Headers show
Series
  • Sync intel-lpss workaround with upstream version
Related show

Commit Message

Kai Heng Feng Nov. 26, 2019, 5:03 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1851901

This reverts commit ce14fd14efde09546df8a1accc061a2a957b9014.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/mfd/intel-lpss.c | 20 ++------------------
 include/linux/io.h       |  2 --
 lib/devres.c             | 20 --------------------
 3 files changed, 2 insertions(+), 40 deletions(-)

Patch
diff mbox series

diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index 99d605ec5de9..ff3fba16e735 100644
--- a/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@ -17,7 +17,6 @@ 
 #include <linux/clkdev.h>
 #include <linux/clk-provider.h>
 #include <linux/debugfs.h>
-#include <linux/dmi.h>
 #include <linux/idr.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
@@ -131,17 +130,6 @@  static const struct mfd_cell intel_lpss_spi_cell = {
 static DEFINE_IDA(intel_lpss_devid_ida);
 static struct dentry *intel_lpss_debugfs;
 
-static const struct dmi_system_id mtrr_large_wc_region[] = {
-	{
-		.ident = "Dell Computer Corporation",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-			DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 7390 2-in-1"),
-		},
-	},
-	{ }
-};
-
 static int intel_lpss_request_dma_module(const char *name)
 {
 	static bool intel_lpss_dma_requested;
@@ -409,12 +397,8 @@  int intel_lpss_probe(struct device *dev,
 	if (!lpss)
 		return -ENOMEM;
 
-	if (dmi_check_system(mtrr_large_wc_region))
-		lpss->priv = devm_ioremap_uc(dev, info->mem->start + LPSS_PRIV_OFFSET,
-					     LPSS_PRIV_SIZE);
-	else
-		lpss->priv = devm_ioremap(dev, info->mem->start + LPSS_PRIV_OFFSET,
-					  LPSS_PRIV_SIZE);
+	lpss->priv = devm_ioremap(dev, info->mem->start + LPSS_PRIV_OFFSET,
+				  LPSS_PRIV_SIZE);
 	if (!lpss->priv)
 		return -ENOMEM;
 
diff --git a/include/linux/io.h b/include/linux/io.h
index da39ff89df65..32e30e8fb9db 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -75,8 +75,6 @@  static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
 
 void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
 			   resource_size_t size);
-void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
-				   resource_size_t size);
 void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
 				   resource_size_t size);
 void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,
diff --git a/lib/devres.c b/lib/devres.c
index 00a61bbee07b..faccf1a037d0 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -9,7 +9,6 @@ 
 enum devm_ioremap_type {
 	DEVM_IOREMAP = 0,
 	DEVM_IOREMAP_NC,
-	DEVM_IOREMAP_UC,
 	DEVM_IOREMAP_WC,
 };
 
@@ -40,9 +39,6 @@  static void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset,
 	case DEVM_IOREMAP_NC:
 		addr = ioremap_nocache(offset, size);
 		break;
-	case DEVM_IOREMAP_UC:
-		addr = ioremap_uc(offset, size);
-		break;
 	case DEVM_IOREMAP_WC:
 		addr = ioremap_wc(offset, size);
 		break;
@@ -72,22 +68,6 @@  void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
 }
 EXPORT_SYMBOL(devm_ioremap);
 
-/**
- * devm_ioremap_uc - Managed ioremap_uc()
- * @dev: Generic device to remap IO address for
- * @offset: Resource address to map
- * @size: Size of map
- *
- * Managed ioremap_uc().  Map is automatically unmapped on driver detach.
- */
-void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
-			      resource_size_t size)
-{
-	return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_UC);
-}
-EXPORT_SYMBOL(devm_ioremap_uc);
-
-
 /**
  * devm_ioremap_nocache - Managed ioremap_nocache()
  * @dev: Generic device to remap IO address for