aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>2018-11-15 08:04:12 +0530
committerManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>2018-11-15 13:12:25 +0530
commit5802843bf78c1855aec1908240db940cf79b47e9 (patch)
tree47ef02016b0aef4e2b0aa6703e2c7e89859428f4
parent3cc461e3b2d8e30382ef594b854d30917270e9de (diff)
download96b-common-rock960-isp.tar.gz
HACK: Disable runtime PM as a workaround for boot hang issuerock960-isp
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-rw-r--r--drivers/media/platform/rockchip/isp1/dev.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/media/platform/rockchip/isp1/dev.c b/drivers/media/platform/rockchip/isp1/dev.c
index 7d4d1ec2aab1..0fa7ed251490 100644
--- a/drivers/media/platform/rockchip/isp1/dev.c
+++ b/drivers/media/platform/rockchip/isp1/dev.c
@@ -11,7 +11,6 @@
#include <linux/of.h>
#include <linux/of_graph.h>
#include <linux/of_platform.h>
-#include <linux/pm_runtime.h>
#include <linux/pinctrl/consumer.h>
#include "common.h"
#include "regs.h"
@@ -555,8 +554,6 @@ static int rkisp1_plat_probe(struct platform_device *pdev)
if (ret < 0)
goto err_unreg_media_dev;
- pm_runtime_enable(&pdev->dev);
-
return 0;
err_unreg_media_dev:
@@ -570,7 +567,6 @@ static int rkisp1_plat_remove(struct platform_device *pdev)
{
struct rkisp1_device *isp_dev = platform_get_drvdata(pdev);
- pm_runtime_disable(&pdev->dev);
media_device_unregister(&isp_dev->media_dev);
v4l2_device_unregister(&isp_dev->v4l2_dev);
rkisp1_unregister_params_vdev(&isp_dev->params_vdev);
@@ -586,7 +582,7 @@ static int __maybe_unused rkisp1_runtime_suspend(struct device *dev)
struct rkisp1_device *isp_dev = dev_get_drvdata(dev);
rkisp1_disable_sys_clk(isp_dev);
- return pinctrl_pm_select_sleep_state(dev);
+ return 0;
}
static int __maybe_unused rkisp1_runtime_resume(struct device *dev)
@@ -594,25 +590,15 @@ static int __maybe_unused rkisp1_runtime_resume(struct device *dev)
struct rkisp1_device *isp_dev = dev_get_drvdata(dev);
int ret;
- ret = pinctrl_pm_select_default_state(dev);
- if (ret < 0)
- return ret;
rkisp1_enable_sys_clk(isp_dev);
return 0;
}
-static const struct dev_pm_ops rkisp1_plat_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
- pm_runtime_force_resume)
- SET_RUNTIME_PM_OPS(rkisp1_runtime_suspend, rkisp1_runtime_resume, NULL)
-};
-
static struct platform_driver rkisp1_plat_drv = {
.driver = {
.name = DRIVER_NAME,
.of_match_table = of_match_ptr(rkisp1_plat_of_match),
- .pm = &rkisp1_plat_pm_ops,
},
.probe = rkisp1_plat_probe,
.remove = rkisp1_plat_remove,