]> git.baikalelectronics.ru Git - kernel.git/commit
drivers: of: of_reserved_mem: fixup the CMA alignment not to affect dma-coherent
authorJaewon <jaewon31.kim@samsung.com>
Wed, 25 May 2016 04:29:50 +0000 (13:29 +0900)
committerRob Herring <robh@kernel.org>
Fri, 3 Jun 2016 12:24:10 +0000 (07:24 -0500)
commitbd45abfe987c17347f2e57539036277611ce4b77
tree85179fabe95d6cb5af46742b1d16b093b3d8130b
parentf9d333b5cbc0057d0862ea0a8fa9d72ac382b786
drivers: of: of_reserved_mem: fixup the CMA alignment not to affect dma-coherent

There was an alignment mismatch issue for CMA and it was fixed by
commit 6b19894f454f ("drivers: of: of_reserved_mem: fixup the alignment with CMA setup").
However the way of the commit considers not only dma-contiguous(CMA) but also
dma-coherent which has no that requirement.

This patch checks more to distinguish dma-contiguous(CMA) from dma-coherent.

Signed-off-by: Jaewon Kim <jaewon31.kim@samsung.com>
Acked-by: Jason Liu <r64343@freescale.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
[robh: remove erroneous opening bracket]
Signed-off-by: Rob Herring <robh@kernel.org>
drivers/of/of_reserved_mem.c