projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dmaengine-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...
[platform/kernel/linux-rpi.git]
/
drivers
/
dma
/
owl-dma.c
diff --git
a/drivers/dma/owl-dma.c
b/drivers/dma/owl-dma.c
index
b6e0ac8
..
3844767
100644
(file)
--- a/
drivers/dma/owl-dma.c
+++ b/
drivers/dma/owl-dma.c
@@
-20,8
+20,9
@@
#include <linux/io.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/io.h>
#include <linux/mm.h>
#include <linux/module.h>
-#include <linux/of
_device
.h>
+#include <linux/of.h>
#include <linux/of_dma.h>
#include <linux/of_dma.h>
+#include <linux/platform_device.h>
#include <linux/slab.h>
#include "virt-dma.h"
#include <linux/slab.h>
#include "virt-dma.h"
@@
-1116,7
+1117,7
@@
static int owl_dma_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "dma-channels %d, dma-requests %d\n",
nr_channels, nr_requests);
dev_info(&pdev->dev, "dma-channels %d, dma-requests %d\n",
nr_channels, nr_requests);
- od->devid = (
enum owl_dma_id
)of_device_get_match_data(&pdev->dev);
+ od->devid = (
uintptr_t
)of_device_get_match_data(&pdev->dev);
od->nr_pchans = nr_channels;
od->nr_vchans = nr_requests;
od->nr_pchans = nr_channels;
od->nr_vchans = nr_requests;