Loading drivers/dma/imx-sdma.c +2 −7 Original line number Diff line number Diff line Loading @@ -1934,16 +1934,11 @@ static int sdma_init(struct sdma_engine *sdma) static bool sdma_filter_fn(struct dma_chan *chan, void *fn_param) { struct sdma_channel *sdmac = to_sdma_chan(chan); struct sdma_engine *sdma = sdmac->sdma; struct imx_dma_data *data = fn_param; if (!imx_dma_is_general_purpose(chan)) return false; /* return false if it's not the right device */ if (sdma->dev->of_node != data->of_node) return false; sdmac->data = *data; chan->private = &sdmac->data; Loading Loading @@ -1971,9 +1966,9 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec, * be set to sdmac->event_id1. */ data.dma_request2 = 0; data.of_node = ofdma->of_node; return dma_request_channel(mask, sdma_filter_fn, &data); return __dma_request_channel(&mask, sdma_filter_fn, &data, ofdma->of_node); } static int sdma_probe(struct platform_device *pdev) Loading include/linux/platform_data/dma-imx.h +0 −1 Original line number Diff line number Diff line Loading @@ -55,7 +55,6 @@ struct imx_dma_data { int dma_request2; /* secondary DMA request line */ enum sdma_peripheral_type peripheral_type; int priority; struct device_node *of_node; }; static inline int imx_dma_is_ipu(struct dma_chan *chan) Loading Loading
drivers/dma/imx-sdma.c +2 −7 Original line number Diff line number Diff line Loading @@ -1934,16 +1934,11 @@ static int sdma_init(struct sdma_engine *sdma) static bool sdma_filter_fn(struct dma_chan *chan, void *fn_param) { struct sdma_channel *sdmac = to_sdma_chan(chan); struct sdma_engine *sdma = sdmac->sdma; struct imx_dma_data *data = fn_param; if (!imx_dma_is_general_purpose(chan)) return false; /* return false if it's not the right device */ if (sdma->dev->of_node != data->of_node) return false; sdmac->data = *data; chan->private = &sdmac->data; Loading Loading @@ -1971,9 +1966,9 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec, * be set to sdmac->event_id1. */ data.dma_request2 = 0; data.of_node = ofdma->of_node; return dma_request_channel(mask, sdma_filter_fn, &data); return __dma_request_channel(&mask, sdma_filter_fn, &data, ofdma->of_node); } static int sdma_probe(struct platform_device *pdev) Loading
include/linux/platform_data/dma-imx.h +0 −1 Original line number Diff line number Diff line Loading @@ -55,7 +55,6 @@ struct imx_dma_data { int dma_request2; /* secondary DMA request line */ enum sdma_peripheral_type peripheral_type; int priority; struct device_node *of_node; }; static inline int imx_dma_is_ipu(struct dma_chan *chan) Loading