diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:20 +0100 |
commit | 2fd537346756d1f306a4ef8532552284aa457408 (patch) | |
tree | a206d551c7304923aef022a076bb21807192238d /arch/sh | |
parent | 0e76ee41fc87a17541e32d6be5a4701e24391da0 (diff) | |
parent | cd2b65741e72da64508957cd1cde85116102d8dd (diff) | |
download | linux-stable-2fd537346756d1f306a4ef8532552284aa457408.tar.gz linux-stable-2fd537346756d1f306a4ef8532552284aa457408.tar.bz2 linux-stable-2fd537346756d1f306a4ef8532552284aa457408.zip |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 85d5255d259f..0d3049244cd3 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -874,6 +874,8 @@ static struct platform_device fsi_da7210_device = { .name = "asoc-simple-card", .dev = { .platform_data = &fsi_da7210_info, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &fsi_da7210_device.dev.coherent_dma_mask, }, }; |