]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mfd: Inherit coherent_dma_mask from parent device
authorBoris BREZILLON <boris.brezillon@free-electrons.com>
Mon, 22 Sep 2014 19:37:55 +0000 (21:37 +0200)
committerLee Jones <lee.jones@linaro.org>
Fri, 26 Sep 2014 07:24:01 +0000 (08:24 +0100)
dma_mask and dma_parms are already inherited from the parent device but
dma_coherent_mask was left uninitialized (set to zero thanks to kzalloc).
Set sub-device coherent_dma_mask to its parent value to simplify
sub-drivers making use of dma coherent helper functions (those drivers
currently have to explicitly set the dma coherent mask using
dma_set_coherent_mask function).

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/mfd-core.c

index 892d343193ad639520563c3d774ecc61d6ede8ea..5d0fbe1e097a3b17873dacc714ebca756f57a131 100644 (file)
@@ -101,6 +101,7 @@ static int mfd_add_device(struct device *parent, int id,
        pdev->dev.type = &mfd_dev_type;
        pdev->dev.dma_mask = parent->dma_mask;
        pdev->dev.dma_parms = parent->dma_parms;
+       pdev->dev.coherent_dma_mask = parent->coherent_dma_mask;
 
        ret = regulator_bulk_register_supply_alias(
                        &pdev->dev, cell->parent_supplies,