@@ -14,7 +14,6 @@
#include <linux/clkdev.h>
#include <linux/clk-provider.h>
#include <linux/debugfs.h>
-#include <linux/dmi.h>
#include <linux/idr.h>
#include <linux/io.h>
#include <linux/ioport.h>
@@ -129,17 +128,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 void intel_lpss_cache_ltr(struct intel_lpss *lpss)
{
lpss->active_ltr = readl(lpss->priv + LPSS_PRIV_ACTIVELTR);
@@ -396,12 +384,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;
@@ -64,8 +64,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,
@@ -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
BugLink: https://bugs.launchpad.net/bugs/1851901 This reverts commit 4aa769b43fa4b472b9cd0266861c215ff5fe6e3d. 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(-)