From a1a7e31c6145b79296d5ac1c40deafe42701d93a Mon Sep 17 00:00:00 2001 From: Niranjan Dighe Date: Fri, 2 Aug 2019 11:50:31 +0530 Subject: [PATCH] Revert "adsp: add dma_set_mask parse" This reverts commit 4c531e24d2a08eaef19ea5e366374d0aab6b58bd. Jira EMA-1251 Change-Id: I3de386b442ecf3beca938db0725bbe3e673d15c1 Signed-off-by: Niranjan Dighe Reviewed-on: https://git-master.nvidia.com/r/2166541 Reviewed-by: Uday Gupta Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Dipesh Gandhi Reviewed-by: Mohan Kumar D GVS: Gerrit_Virtual_Submit Reviewed-by: Nitin Pai Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/platform/tegra/nvadsp/os.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/platform/tegra/nvadsp/os.c b/drivers/platform/tegra/nvadsp/os.c index 6e43ef87..64df48e0 100644 --- a/drivers/platform/tegra/nvadsp/os.c +++ b/drivers/platform/tegra/nvadsp/os.c @@ -41,7 +41,6 @@ #include #include #include -#include #include @@ -2148,9 +2147,8 @@ static ssize_t tegrafw_read_adsp(struct device *dev, int __init nvadsp_os_probe(struct platform_device *pdev) { struct nvadsp_drv_data *drv_data = platform_get_drvdata(pdev); - struct device *dev = &pdev->dev; - uint64_t dma_mask; uint16_t com_mid = ADSP_COM_MBOX_ID; + struct device *dev = &pdev->dev; int ret = 0; priv.unit_fpga_reset_reg = drv_data->base_regs[UNIT_FPGA_RST]; @@ -2167,14 +2165,6 @@ int __init nvadsp_os_probe(struct platform_device *pdev) drv_data->deassert_adsp = __deassert_adsp; } - ret = of_property_read_u64(dev->of_node, "dma-mask", &dma_mask); - if (ret) { - dev_err(&pdev->dev, "Missing property dma-mask\n"); - goto end; - } else { - dma_set_mask_and_coherent(&pdev->dev, dma_mask); - } - ret = nvadsp_os_init(pdev); if (ret) { dev_err(dev, "failed to init os\n");