Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ruN a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
- --- a/drivers/mfd/intel-lpss.c 2019-11-20 20:41:11.000000000 +0100
- +++ b/drivers/mfd/intel-lpss.c 2019-11-21 14:53:42.643199518 +0100
- @@ -395,8 +395,8 @@
- if (!lpss)
- return -ENOMEM;
- - lpss->priv = devm_ioremap(dev, info->mem->start + LPSS_PRIV_OFFSET,
- - LPSS_PRIV_SIZE);
- + lpss->priv = devm_ioremap_uc(dev, info->mem->start + LPSS_PRIV_OFFSET,
- + LPSS_PRIV_SIZE);
- if (!lpss->priv)
- return -ENOMEM;
- diff -ruN a/include/linux/io.h b/include/linux/io.h
- --- a/include/linux/io.h 2019-11-20 20:41:11.000000000 +0100
- +++ b/include/linux/io.h 2019-11-21 14:54:14.855593598 +0100
- @@ -64,6 +64,8 @@
- 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 -ruN a/lib/devres.c b/lib/devres.c
- --- a/lib/devres.c 2019-11-20 20:41:11.000000000 +0100
- +++ b/lib/devres.c 2019-11-21 14:55:36.996598780 +0100
- @@ -9,6 +9,7 @@
- enum devm_ioremap_type {
- DEVM_IOREMAP = 0,
- DEVM_IOREMAP_NC,
- + DEVM_IOREMAP_UC,
- DEVM_IOREMAP_WC,
- };
- @@ -39,6 +40,9 @@
- 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;
- @@ -69,6 +73,21 @@
- 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
- * @offset: Resource address to map
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement