]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: dwc3: Do not set dma coherent mask
authorArnd Bergmann <arnd@arndb.de>
Thu, 17 Nov 2016 11:43:48 +0000 (17:13 +0530)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Fri, 18 Nov 2016 11:54:55 +0000 (13:54 +0200)
The dma mask is correctly set up by the DT probe function, no
need to override it any more.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc3/dwc3-exynos.c
drivers/usb/dwc3/dwc3-st.c

index 2f1fb7e7aa548f831fb9cfa63d24513c292d15b4..e27899bb57064b94811fae851587b06b743128ff 100644 (file)
@@ -20,7 +20,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
 #include <linux/clk.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/usb_phy_generic.h>
@@ -117,15 +116,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        if (!exynos)
                return -ENOMEM;
 
-       /*
-        * Right now device-tree probed devices don't get dma_mask set.
-        * Since shared usb code relies on it, set it here for now.
-        * Once we move to full device tree support this will vanish off.
-        */
-       ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
-       if (ret)
-               return ret;
-
        platform_set_drvdata(pdev, exynos);
 
        exynos->dev     = dev;
index 89a2f712fdfe32f5fc0a6fc0681b0d8db005e2a2..4d7439cb8cd86e6e192b3fb93192e8acb503780c 100644 (file)
@@ -218,7 +218,6 @@ static int st_dwc3_probe(struct platform_device *pdev)
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
-       dma_set_coherent_mask(dev, dev->coherent_dma_mask);
        dwc3_data->dev = dev;
        dwc3_data->regmap = regmap;