diff options
author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2014-09-22 15:37:55 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-09-26 03:24:01 -0400 |
commit | 4f08df1b06bb4022fab5a2a916f455915856ed9e (patch) | |
tree | b5c0deacc0f1c9cdba180b83770b83e4f360f656 | |
parent | ab27c44754964aedd9f9ba74326d74e5e2a3c74f (diff) |
mfd: Inherit coherent_dma_mask from parent device
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>
-rw-r--r-- | drivers/mfd/mfd-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 892d343193ad..5d0fbe1e097a 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c | |||
@@ -101,6 +101,7 @@ static int mfd_add_device(struct device *parent, int id, | |||
101 | pdev->dev.type = &mfd_dev_type; | 101 | pdev->dev.type = &mfd_dev_type; |
102 | pdev->dev.dma_mask = parent->dma_mask; | 102 | pdev->dev.dma_mask = parent->dma_mask; |
103 | pdev->dev.dma_parms = parent->dma_parms; | 103 | pdev->dev.dma_parms = parent->dma_parms; |
104 | pdev->dev.coherent_dma_mask = parent->coherent_dma_mask; | ||
104 | 105 | ||
105 | ret = regulator_bulk_register_supply_alias( | 106 | ret = regulator_bulk_register_supply_alias( |
106 | &pdev->dev, cell->parent_supplies, | 107 | &pdev->dev, cell->parent_supplies, |