mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
Merge branch 'topic/sh' into for-linus
This commit is contained in:
commit
0dae18450a
3 changed files with 5 additions and 5 deletions
|
@ -12,7 +12,7 @@ config RENESAS_DMA
|
|||
|
||||
config SH_DMAE_BASE
|
||||
bool "Renesas SuperH DMA Engine support"
|
||||
depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
|
||||
depends on SUPERH || ARCH_RENESAS || COMPILE_TEST
|
||||
depends on !SUPERH || SH_DMA
|
||||
depends on !SH_DMA_API
|
||||
default y
|
||||
|
@ -41,7 +41,7 @@ endif
|
|||
|
||||
config RCAR_DMAC
|
||||
tristate "Renesas R-Car Gen2 DMA Controller"
|
||||
depends on ARCH_SHMOBILE || COMPILE_TEST
|
||||
depends on ARCH_RENESAS || COMPILE_TEST
|
||||
select RENESAS_DMA
|
||||
help
|
||||
This driver supports the general purpose DMA controller found in the
|
||||
|
@ -49,7 +49,7 @@ config RCAR_DMAC
|
|||
|
||||
config RENESAS_USB_DMAC
|
||||
tristate "Renesas USB-DMA Controller"
|
||||
depends on ARCH_SHMOBILE || COMPILE_TEST
|
||||
depends on ARCH_RENESAS || COMPILE_TEST
|
||||
select RENESAS_DMA
|
||||
select DMA_VIRTUAL_CHANNELS
|
||||
help
|
||||
|
|
|
@ -413,7 +413,7 @@ static int rcar_dmac_init(struct rcar_dmac *dmac)
|
|||
u16 dmaor;
|
||||
|
||||
/* Clear all channels and enable the DMAC globally. */
|
||||
rcar_dmac_write(dmac, RCAR_DMACHCLR, 0x7fff);
|
||||
rcar_dmac_write(dmac, RCAR_DMACHCLR, GENMASK(dmac->n_channels - 1, 0));
|
||||
rcar_dmac_write(dmac, RCAR_DMAOR,
|
||||
RCAR_DMAOR_PRI_FIXED | RCAR_DMAOR_DME);
|
||||
|
||||
|
|
|
@ -699,7 +699,7 @@ static int sh_dmae_probe(struct platform_device *pdev)
|
|||
struct resource *chan, *dmars, *errirq_res, *chanirq_res;
|
||||
|
||||
if (pdev->dev.of_node)
|
||||
pdata = of_match_device(sh_dmae_of_match, &pdev->dev)->data;
|
||||
pdata = of_device_get_match_data(&pdev->dev);
|
||||
else
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
|
||||
|
|
Loading…
Reference in a new issue