diff options
| author | Tero Kristo <t-kristo@ti.com> | 2014-09-18 16:03:49 +0300 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2014-09-18 18:05:02 +0300 |
| commit | 7949f0ac29fdc8476c3c3eaf77368f1e30f3901b (patch) | |
| tree | fe474b3686df16d6901d9fb114281d8cee7df662 /include | |
| parent | 8a0a06f5ff6770f4c8c92c894da8e36c93248a31 (diff) | |
| parent | f42acac7d35dd6b3ab982b5ccc0f27e1053a916e (diff) | |
Merge branch 'platform-ti-linux-3.14.y' into pm-ti-linux-3.14.y
Conflicts:
arch/arm/boot/dts/dra72x.dtsi
arch/arm/boot/dts/dra74x.dtsi
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clk/ti.h | 3 | ||||
| -rw-r--r-- | include/linux/of_dma.h | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h index f411764a8b7..1bd1fb5532a 100644 --- a/include/linux/clk/ti.h +++ b/include/linux/clk/ti.h @@ -293,7 +293,8 @@ void omap2xxx_clkt_vps_init(void); void __iomem *ti_clk_get_reg_addr(struct device_node *node, int index); void ti_dt_clocks_register(struct ti_dt_clk *oclks); void ti_dt_clk_init_provider(struct device_node *np, int index); -void ti_dt_clockdomains_setup(struct device_node *node); +void ti_dt_clk_init_retry(void); +void ti_dt_clockdomains_setup(void); int ti_clk_retry_init(struct device_node *node, struct clk_hw *hw, ti_of_clk_init_cb_t func); int of_ti_clk_autoidle_setup(struct device_node *node); diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h index ae36298ba07..ad6c4812e27 100644 --- a/include/linux/of_dma.h +++ b/include/linux/of_dma.h @@ -26,6 +26,12 @@ struct of_dma { void *of_dma_data; }; +struct of_dma_router { + struct list_head of_dma_routers; + struct device_node *of_node; + void *of_router_data; +}; + struct of_dma_filter_info { dma_cap_mask_t dma_cap; dma_filter_fn filter_fn; @@ -41,6 +47,9 @@ 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); +void *of_dma_get_router_data(phandle router); +int of_dma_router_register(struct device_node *np, void *data); +void of_dma_router_free(struct device_node *np); #else static inline int of_dma_controller_register(struct device_node *np, struct dma_chan *(*of_dma_xlate) @@ -66,6 +75,19 @@ static inline struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_s return NULL; } +static inline void *of_dma_get_router_data(phandle router) +{ + return NULL; +} + +static inline int of_dma_router_register(struct device_node *np, void *data) +{ + return NULL; +} + +static void of_dma_router_free(struct device_node *np) +{ +} #endif #endif /* __LINUX_OF_DMA_H */ |