video: tegra: host: nvjpg: remove boot from init

- remove duplicate falcon boot from device init.
- add reset before booting falcon engines.
- remove platform specific callback set from probe.

Bug 200006528

Change-Id: Idd28986ac8105ed1d8a75dc9e27c5e366711e47b
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/415539
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/drivers/video/tegra/host/nvjpg/nvjpg.c b/drivers/video/tegra/host/nvjpg/nvjpg.c
index b3ff1bfec0bf032a0c01cb282eba49c61e03e76c..34f939dc2275e32a2432b786c7308d3f6f8e0f72 100644 (file)
--- a/drivers/video/tegra/host/nvjpg/nvjpg.c
+++ b/drivers/video/tegra/host/nvjpg/nvjpg.c
@@ -359,10 +359,6 @@ int nvhost_nvjpg_init(struct platform_device *dev)
                goto clean_up;
        }
 
-       nvhost_module_busy(dev);
-       nvjpg_boot(dev);
-       nvhost_module_idle(dev);
-
        if (pdata->scaling_init)
                nvhost_scale_hw_init(dev);
 
@@ -398,6 +394,13 @@ void nvhost_nvjpg_deinit(struct platform_device *dev)
 
 int nvhost_nvjpg_t210_finalize_poweron(struct platform_device *dev)
 {
+       struct nvhost_device_data *pdata = platform_get_drvdata(dev);
+
+       /* reset device before boot */
+       tegra_periph_reset_assert(pdata->clk[0]);
+       udelay(10);
+       tegra_periph_reset_deassert(pdata->clk[0]);
+
        host1x_writel(dev, 0x117c, 0x18004);
        return nvhost_nvjpg_finalize_poweron(dev);
 }
@@ -436,9 +439,6 @@ static int nvjpg_probe(struct platform_device *dev)
        }
 
        pdata->pdev = dev;
-       pdata->init = nvhost_nvjpg_init;
-       pdata->deinit = nvhost_nvjpg_deinit;
-       pdata->finalize_poweron = nvhost_nvjpg_finalize_poweron;
 
        mutex_init(&pdata->lock);
 

diff --git a/drivers/video/tegra/host/nvjpg/nvjpg.h b/drivers/video/tegra/host/nvjpg/nvjpg.h
index 740bbf5900642f0d13075e0c10a0c07669096af9..b91d22972885f84c48ed973d4e7cfe3ce2d91d97 100644 (file)
--- a/drivers/video/tegra/host/nvjpg/nvjpg.h
+++ b/drivers/video/tegra/host/nvjpg/nvjpg.h
@@ -1,13 +1,7 @@
 /*
  * Tegra NVJPG Module Support
  *
-<<<<<<< HEAD:drivers/video/tegra/host/nvjpg/nvjpg.h
  * Copyright (c) 2013-2014, NVIDIA CORPORATION.  All rights reserved.
-=======
- * Tegra MSENC Module Support
- *
- * Copyright (c) 2012-2014, NVIDIA CORPORATION.  All rights reserved.
->>>>>>> video: tegra: host: nvenc: Initialize PROD values:drivers/video/tegra/host/msenc/msenc.h
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,