These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / of_dma.h

diff --git a/kernel/include/linux/of_dma.h b/kernel/include/linux/of_dma.h
index 56bc026..b90d8ec 100644 (file)
--- a/kernel/include/linux/of_dma.h
+++ b/kernel/include/linux/of_dma.h
@@ -23,6 +23,9 @@ struct of_dma {
        struct device_node      *of_node;
        struct dma_chan         *(*of_dma_xlate)
                                (struct of_phandle_args *, struct of_dma *);
+       void                    *(*of_dma_route_allocate)
+                               (struct of_phandle_args *, struct of_dma *);
+       struct dma_router       *dma_router;
        void                    *of_dma_data;
 };
 
@@ -31,18 +34,26 @@ struct of_dma_filter_info {
        dma_filter_fn   filter_fn;
 };
 
-#ifdef CONFIG_OF
+#ifdef CONFIG_DMA_OF
 extern int of_dma_controller_register(struct device_node *np,
                struct dma_chan *(*of_dma_xlate)
                (struct of_phandle_args *, struct of_dma *),
                void *data);
 extern void of_dma_controller_free(struct device_node *np);
+
+extern int of_dma_router_register(struct device_node *np,
+               void *(*of_dma_route_allocate)
+               (struct of_phandle_args *, struct of_dma *),
+               struct dma_router *dma_router);
+#define of_dma_router_free of_dma_controller_free
+
 extern struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
                                                     const char *name);
 extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
                struct of_dma *ofdma);
 extern struct dma_chan *of_dma_xlate_by_chan_id(struct of_phandle_args *dma_spec,
                struct of_dma *ofdma);
+
 #else
 static inline int of_dma_controller_register(struct device_node *np,
                struct dma_chan *(*of_dma_xlate)
@@ -56,10 +67,20 @@ static inline void of_dma_controller_free(struct device_node *np)
 {
 }
 
+static inline int of_dma_router_register(struct device_node *np,
+               void *(*of_dma_route_allocate)
+               (struct of_phandle_args *, struct of_dma *),
+               struct dma_router *dma_router)
+{
+       return -ENODEV;
+}
+
+#define of_dma_router_free of_dma_controller_free
+
 static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
                                                     const char *name)
 {
-       return NULL;
+       return ERR_PTR(-ENODEV);
 }
 
 static inline struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,