summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-xtreme/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-03-30 18:23:49 -0400
committerDavid P <megver83@parabola.nu>2020-03-30 18:23:49 -0400
commit72c9ab660ff2d9068ffb126e3ee45aba10877507 (patch)
tree17bc24fe8efd8b02be9f30acd94c604e964eb1cd /kernels/linux-libre-xtreme/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
parentf9ec026b6d59348459a8e57046587d5a4ae7e4a1 (diff)
downloadabslibre-72c9ab660ff2d9068ffb126e3ee45aba10877507.tar.gz
abslibre-72c9ab660ff2d9068ffb126e3ee45aba10877507.tar.bz2
abslibre-72c9ab660ff2d9068ffb126e3ee45aba10877507.zip
updpkg: kernels/linux-libre-xtreme 5.5.13-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'kernels/linux-libre-xtreme/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch')
-rw-r--r--kernels/linux-libre-xtreme/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch79
1 files changed, 0 insertions, 79 deletions
diff --git a/kernels/linux-libre-xtreme/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch b/kernels/linux-libre-xtreme/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
deleted file mode 100644
index 8c0ba2b8d..000000000
--- a/kernels/linux-libre-xtreme/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6a7489b6d1f0a586c08cc3ae6887f53f59e96b86 Mon Sep 17 00:00:00 2001
-From: Tuowen Zhao <ztuowen@gmail.com>
-Date: Wed, 16 Oct 2019 15:06:28 -0600
-Subject: [PATCH 02/14] lib: devres: add a helper function for ioremap_uc
-
-Implement a resource managed strongly uncachable ioremap function.
-
-Cc: <stable@vger.kernel.org> # v4.19+
-Tested-by: AceLan Kao <acelan.kao@canonical.com>
-Signed-off-by: Tuowen Zhao <ztuowen@gmail.com>
-Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Acked-by: Luis Chamberlain <mcgrof@kernel.org>
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
----
- include/linux/io.h | 2 ++
- lib/devres.c | 19 +++++++++++++++++++
- 2 files changed, 21 insertions(+)
-
-diff --git a/include/linux/io.h b/include/linux/io.h
-index accac822336a..a59834bc0a11 100644
---- a/include/linux/io.h
-+++ b/include/linux/io.h
-@@ -64,6 +64,8 @@ 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 6a0e9bd6524a..17624d35e82d 100644
---- a/lib/devres.c
-+++ b/lib/devres.c
-@@ -9,6 +9,7 @@
- enum devm_ioremap_type {
- DEVM_IOREMAP = 0,
- DEVM_IOREMAP_NC,
-+ DEVM_IOREMAP_UC,
- DEVM_IOREMAP_WC,
- };
-
-@@ -39,6 +40,9 @@ 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;
-@@ -68,6 +72,21 @@ 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_GPL(devm_ioremap_uc);
-+
- /**
- * devm_ioremap_nocache - Managed ioremap_nocache()
- * @dev: Generic device to remap IO address for
---
-2.25.0
-